Minor changes to wording and formatting.

rust-lang · Jan 17, 2019 · 80ee94c · 80ee94c
1 parent 22e97da
commit 80ee94c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/src/dlmalloc b/src/dlmalloc
diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins
diff --git a/src/liblibc b/src/liblibc
diff --git 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<String>,
-    /// Whether to persist the doctest executables.
+    /// Otional path to persist the doctest executables to.
     pub persist_doctests: Option<PathBuf>,
 
     // 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
@@ -343,7 +343,7 @@ fn opts() -> Vec<RustcOptGroup> {
         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
@@ -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
@@ -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: