rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Minor changes to wording and formatting.

Browse Source
This commit is contained in:
Wesley Norris
2018-12-16 17:31:36 -05:00
parent 22e97da30a
commit 80ee94c1f8
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dlmalloc Submodule

Submodule src/dlmalloc added at c99638dc2e

1
src/libcompiler_builtins Submodule

Submodule src/libcompiler_builtins added at fe74674f6e

1
src/liblibc Submodule

Submodule src/liblibc added at c75ca6465a

3
src/librustdoc/config.rs
View File

@@ -68,7 +68,7 @@ pub struct Options {
pub should_test: bool, pub should_test: bool,
/// List of arguments to pass to the test harness, if running tests. /// List of arguments to pass to the test harness, if running tests.
pub test_args: Vec<String>, pub test_args: Vec<String>,
/// Whether to persist the doctest executables. /// Otional path to persist the doctest executables to.
pub persist_doctests: Option<PathBuf>, pub persist_doctests: Option<PathBuf>,
// Options that affect the documentation process // Options that affect the documentation process
@@ -123,6 +123,7 @@ impl fmt::Debug for Options {
.field("lint_cap", &self.lint_cap) .field("lint_cap", &self.lint_cap)
.field("should_test", &self.should_test) .field("should_test", &self.should_test)
.field("test_args", &self.test_args) .field("test_args", &self.test_args)
.field("persist_doctests", &self.persist_doctests)
.field("default_passes", &self.default_passes) .field("default_passes", &self.default_passes)
.field("manual_passes", &self.manual_passes) .field("manual_passes", &self.manual_passes)
.field("display_warnings", &self.display_warnings) .field("display_warnings", &self.display_warnings)

2
src/librustdoc/lib.rs
View File

@@ -343,7 +343,7 @@ fn opts() -> Vec<RustcOptGroup> {
unstable("persist-doctests", |o| { unstable("persist-doctests", |o| {
o.optopt("", o.optopt("",
"persist-doctests", "persist-doctests",
"Persists the rustdoc test executables", "Directory to persist doctest executables into",
"PATH") "PATH")
}), }),
] ]

3
src/librustdoc/test.rs
View File

@@ -290,7 +290,8 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
.rsplit('/') .rsplit('/')
.next() .next()
.unwrap() .unwrap()
.replace(".", "_"), line) .replace(".", "_"),
line)
); );
std::fs::create_dir_all(&path) std::fs::create_dir_all(&path)
.expect("Couldn't create directory for doctest executables"); .expect("Couldn't create directory for doctest executables");

5
src/test/rustdoc-ui/failed-doctest-output.stdout
View File

@@ -12,8 +12,7 @@ error[E0425]: cannot find value `no` in this scope
3 | no 3 | no
| ^^ not found in this scope | ^^ 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:361:13
thread '$DIR/failed-doctest-output.rs - OtherStruct (line 27)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:326:13
note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ---- ---- $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 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. 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: failures: