From 80ee94c1f8640e866840dbcafe76ccdcbfe20fd8 Mon Sep 17 00:00:00 2001 From: Wesley Norris Date: Sun, 16 Dec 2018 17:31:36 -0500 Subject: [PATCH] Minor changes to wording and formatting. --- src/dlmalloc | 1 + src/libcompiler_builtins | 1 + src/liblibc | 1 + src/librustdoc/config.rs | 3 ++- src/librustdoc/lib.rs | 2 +- src/librustdoc/test.rs | 3 ++- src/test/rustdoc-ui/failed-doctest-output.stdout | 5 ++--- 7 files changed, 10 insertions(+), 6 deletions(-) create mode 160000 src/dlmalloc create mode 160000 src/libcompiler_builtins create mode 160000 src/liblibc diff --git a/src/dlmalloc b/src/dlmalloc new file mode 160000 index 00000000000..c99638dc2ec --- /dev/null +++ b/src/dlmalloc @@ -0,0 +1 @@ +Subproject commit c99638dc2ecfc750cc1656f6edb2bd062c1e0981 diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins new file mode 160000 index 00000000000..fe74674f6e4 --- /dev/null +++ b/src/libcompiler_builtins @@ -0,0 +1 @@ +Subproject commit fe74674f6e4be76d47b66f67d529ebf4186f4eb1 diff --git a/src/liblibc b/src/liblibc new file mode 160000 index 00000000000..c75ca6465a1 --- /dev/null +++ b/src/liblibc @@ -0,0 +1 @@ +Subproject commit c75ca6465a139704e00295be355b1f067af2f535 diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index 279d3b92134..1c14dbf1cef 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -68,7 +68,7 @@ pub struct Options { pub should_test: bool, /// List of arguments to pass to the test harness, if running tests. pub test_args: Vec, - /// Whether to persist the doctest executables. + /// Otional path to persist the doctest executables to. pub persist_doctests: Option, // Options that affect the documentation process @@ -123,6 +123,7 @@ impl fmt::Debug for Options { .field("lint_cap", &self.lint_cap) .field("should_test", &self.should_test) .field("test_args", &self.test_args) + .field("persist_doctests", &self.persist_doctests) .field("default_passes", &self.default_passes) .field("manual_passes", &self.manual_passes) .field("display_warnings", &self.display_warnings) diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 7fe0999bdca..08bbc95ad65 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -343,7 +343,7 @@ fn opts() -> Vec { unstable("persist-doctests", |o| { o.optopt("", "persist-doctests", - "Persists the rustdoc test executables", + "Directory to persist doctest executables into", "PATH") }), ] diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 725d6861531..0b9fbc81da6 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -290,7 +290,8 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize, .rsplit('/') .next() .unwrap() - .replace(".", "_"), line) + .replace(".", "_"), + line) ); std::fs::create_dir_all(&path) .expect("Couldn't create directory for doctest executables"); diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/src/test/rustdoc-ui/failed-doctest-output.stdout index ad3458c8173..c54e7be46bb 100644 --- a/src/test/rustdoc-ui/failed-doctest-output.stdout +++ b/src/test/rustdoc-ui/failed-doctest-output.stdout @@ -12,8 +12,7 @@ error[E0425]: cannot find value `no` in this scope 3 | no | ^^ not found in this scope - -thread '$DIR/failed-doctest-output.rs - OtherStruct (line 27)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:326:13 +thread '$DIR/failed-doctest-output.rs - OtherStruct (line 27)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:361:13 note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. ---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ---- @@ -22,7 +21,7 @@ thread '$DIR/failed-doctest-output.rs - SomeStruct (line 11)' panicked at 'test thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1 note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. -', src/librustdoc/test.rs:395:17 +', src/librustdoc/test.rs:396:17 failures: