From a4a7bb9a3f72505efb6ca9856af45287c8685d5e Mon Sep 17 00:00:00 2001
From: Matthew Jasper <mjjasper1@gmail.com>
Date: Mon, 15 Jul 2019 22:26:45 +0100
Subject: Make pretty-expanded-hygiene a `ui` test

`normalize-stdout-test` removes the need for Make, and it can be updated
with `--bless` this way
---
 .../pretty-expanded-hygiene/Makefile                | 21 ---------------------
 .../pretty-expanded-hygiene/input.pp.rs             |  9 ---------
 .../pretty-expanded-hygiene/input.rs                | 14 --------------
 src/test/ui/hygiene/unpretty-debug.rs               | 20 ++++++++++++++++++++
 src/test/ui/hygiene/unpretty-debug.stdout           | 15 +++++++++++++++
 5 files changed, 35 insertions(+), 44 deletions(-)
 delete mode 100644 src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
 delete mode 100644 src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
 delete mode 100644 src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
 create mode 100644 src/test/ui/hygiene/unpretty-debug.rs
 create mode 100644 src/test/ui/hygiene/unpretty-debug.stdout

diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile b/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
deleted file mode 100644
index 136d7643ade..00000000000
--- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
--include ../tools.mk
-
-REPLACEMENT := s/[0-9][0-9]*\#[0-9][0-9]*/$(shell date)/g
-
-all:
-	$(RUSTC) -o $(TMPDIR)/input.out -Z unstable-options \
-		--pretty expanded,hygiene input.rs
-
-	# the name/ctxt numbers are very internals-dependent and thus
-	# change relatively frequently, and testing for their exact values
-	# them will fail annoyingly, so we just check their positions
-	# (using a non-constant replacement like this will make it less
-	# likely the compiler matches whatever other dummy value we
-	# choose).
-	#
-	# (These need to be out-of-place because OSX/BSD & GNU sed
-	# differ.)
-	sed "$(REPLACEMENT)" input.pp.rs > $(TMPDIR)/input.pp.rs
-	sed "$(REPLACEMENT)" $(TMPDIR)/input.out > $(TMPDIR)/input.out.replaced
-
-	diff -u $(TMPDIR)/input.out.replaced $(TMPDIR)/input.pp.rs
diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
deleted file mode 100644
index 570dece023d..00000000000
--- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// minimal junk
-#![feature /* 0#0 */(no_core)]
-#![no_core /* 0#0 */]
-
-macro_rules! foo /* 0#0 */ { ($ x : ident) => { y + $ x } }
-
-fn bar /* 0#0 */() { let x /* 0#0 */ = 1; y /* 0#1 */ + x /* 0#0 */ }
-
-fn y /* 0#0 */() { }
diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
deleted file mode 100644
index ed3b48dbdc1..00000000000
--- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// minimal junk
-#![feature(no_core)]
-#![no_core]
-
-macro_rules! foo {
-    ($x: ident) => { y + $x }
-}
-
-fn bar() {
-    let x = 1;
-    foo!(x)
-}
-
-fn y() {}
diff --git a/src/test/ui/hygiene/unpretty-debug.rs b/src/test/ui/hygiene/unpretty-debug.rs
new file mode 100644
index 00000000000..6e936bb3d83
--- /dev/null
+++ b/src/test/ui/hygiene/unpretty-debug.rs
@@ -0,0 +1,20 @@
+// check-pass
+// compile-flags: -Zunpretty=expanded,hygiene
+
+// Don't break whenever Symbol numbering changes
+// normalize-stdout-test "\d+#" -> "0#"
+
+// minimal junk
+#![feature(no_core)]
+#![no_core]
+
+macro_rules! foo {
+    ($x: ident) => { y + $x }
+}
+
+fn bar() {
+    let x = 1;
+    foo!(x)
+}
+
+fn y() {}
diff --git a/src/test/ui/hygiene/unpretty-debug.stdout b/src/test/ui/hygiene/unpretty-debug.stdout
new file mode 100644
index 00000000000..beac4c17abf
--- /dev/null
+++ b/src/test/ui/hygiene/unpretty-debug.stdout
@@ -0,0 +1,15 @@
+// check-pass
+// compile-flags: -Zunpretty=expanded,hygiene
+
+// Don't break whenever Symbol numbering changes
+// normalize-stdout-test "\d+#" -> "0#"
+
+// minimal junk
+#![feature /* 0#0 */(no_core)]
+#![no_core /* 0#0 */]
+
+macro_rules! foo /* 0#0 */ { ($ x : ident) => { y + $ x } }
+
+fn bar /* 0#0 */() { let x /* 0#0 */ = 1; y /* 0#1 */ + x /* 0#0 */ }
+
+fn y /* 0#0 */() { }
-- 
cgit 1.4.1-3-g733a5