diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2021-03-25 15:48:21 -0400 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2021-04-23 09:58:34 -0400 |
| commit | 23bbd65d968ef385fa7a7cd90ea8252bd78081b1 (patch) | |
| tree | e2044f67757951f57492ed4bcb347380f10734da /src | |
| parent | 7f4afdf0255600306bf67432da722c7b5d2cbf82 (diff) | |
| download | rust-23bbd65d968ef385fa7a7cd90ea8252bd78081b1.tar.gz rust-23bbd65d968ef385fa7a7cd90ea8252bd78081b1.zip | |
Remove unstable `--pretty` flag
It doesn't do anything `--unpretty` doesn't, and due to a bug, also didn't show up in `--help`. I don't think there's any reason to keep it around, I haven't seen anyone using it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/pretty/block-comment-wchar.pp | 2 | ||||
| -rw-r--r-- | src/test/pretty/block-comment-wchar.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/pretty-expanded/Makefile | 3 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/pretty-print-to-file/Makefile | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/src/test/pretty/block-comment-wchar.pp b/src/test/pretty/block-comment-wchar.pp index 2bfcdd75e15..213fe1637c1 100644 --- a/src/test/pretty/block-comment-wchar.pp +++ b/src/test/pretty/block-comment-wchar.pp @@ -1,6 +1,6 @@ // This is meant as a test case for Issue 3961. // -// Test via: rustc --pretty normal src/test/pretty/block-comment-wchar.rs +// Test via: rustc -Zunpretty normal src/test/pretty/block-comment-wchar.rs // ignore-tidy-cr // ignore-tidy-tab // pp-exact:block-comment-wchar.pp diff --git a/src/test/pretty/block-comment-wchar.rs b/src/test/pretty/block-comment-wchar.rs index 93373c5da65..ed82cbbd8cf 100644 --- a/src/test/pretty/block-comment-wchar.rs +++ b/src/test/pretty/block-comment-wchar.rs @@ -1,6 +1,6 @@ // This is meant as a test case for Issue 3961. // -// Test via: rustc --pretty normal src/test/pretty/block-comment-wchar.rs +// Test via: rustc -Zunpretty normal src/test/pretty/block-comment-wchar.rs // ignore-tidy-cr // ignore-tidy-tab // pp-exact:block-comment-wchar.pp diff --git a/src/test/run-make-fulldeps/pretty-expanded/Makefile b/src/test/run-make-fulldeps/pretty-expanded/Makefile index 7a8dc8d871c..e721c5afdd7 100644 --- a/src/test/run-make-fulldeps/pretty-expanded/Makefile +++ b/src/test/run-make-fulldeps/pretty-expanded/Makefile @@ -1,5 +1,4 @@ -include ../tools.mk all: - $(RUSTC) -o $(TMPDIR)/input.expanded.rs -Z unstable-options \ - --pretty=expanded input.rs + $(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs diff --git a/src/test/run-make-fulldeps/pretty-print-to-file/Makefile b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile index 8909dee11f0..b224c52fcad 100644 --- a/src/test/run-make-fulldeps/pretty-print-to-file/Makefile +++ b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile @@ -1,5 +1,5 @@ -include ../tools.mk all: - $(RUSTC) -o $(TMPDIR)/input.out --pretty=normal -Z unstable-options input.rs + $(RUSTC) -o $(TMPDIR)/input.out -Zunpretty=normal input.rs diff -u $(TMPDIR)/input.out input.pp diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index f31a24738df..505a2d2f79f 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -306,7 +306,7 @@ pub struct TestProps { // a proc-macro and needs `#![crate_type = "proc-macro"]`. This ensures // that the aux file is compiled as a `proc-macro` and not as a `dylib`. pub no_prefer_dynamic: bool, - // Run --pretty expanded when running pretty printing tests + // Run -Zunpretty expanded when running pretty printing tests pub pretty_expanded: bool, // Which pretty mode are we testing with, default to 'normal' pub pretty_mode: String, diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index ecbaccf744d..41de46a43b0 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -599,7 +599,7 @@ impl<'test> TestCx<'test> { return; } - // additionally, run `--pretty expanded` and try to build it. + // additionally, run `-Zunpretty=expanded` and try to build it. let proc_res = self.print_source(ReadFrom::Path, "expanded"); if !proc_res.status.success() { self.fatal_proc_rec("pretty-printing (expanded) failed", &proc_res); |