diff options
| author | Matthew Russo <matthew@edapp.com> | 2018-12-04 15:18:03 -0500 |
|---|---|---|
| committer | Matthew Russo <matthew@edapp.com> | 2018-12-04 19:52:42 -0500 |
| commit | f0f8aa9e05726bfbc065fa2504daf3232f29bc03 (patch) | |
| tree | 5027e1682248fb6e535546046f43dff45d6e2b50 /src/test | |
| parent | 88130f1796e98837dc6f58aea9b9a0f49b85f426 (diff) | |
| download | rust-f0f8aa9e05726bfbc065fa2504daf3232f29bc03.tar.gz rust-f0f8aa9e05726bfbc065fa2504daf3232f29bc03.zip | |
adds DocTest filename variant, refactors doctest_offset out of source_map, fixes remaining test failures
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make-fulldeps/issue-19371/foo.rs | 3 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/failed-doctest-output.stdout | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/test/run-make-fulldeps/issue-19371/foo.rs b/src/test/run-make-fulldeps/issue-19371/foo.rs index 4dfecb33c14..c342e1c4835 100644 --- a/src/test/run-make-fulldeps/issue-19371/foo.rs +++ b/src/test/run-make-fulldeps/issue-19371/foo.rs @@ -72,7 +72,8 @@ fn compile(code: String, output: PathBuf, sysroot: PathBuf) { driver::spawn_thread_pool(opts, |opts| { let (sess, cstore, codegen_backend) = basic_sess(opts); let control = CompileController::basic(); - let input = Input::Str { name: FileName::Anon, input: code }; + let name = FileName::anon_source_code(&code); + let input = Input::Str { name, input: code }; let _ = compile_input( codegen_backend, &sess, diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/src/test/rustdoc-ui/failed-doctest-output.stdout index cab7bda6c67..52e0cdca950 100644 --- a/src/test/rustdoc-ui/failed-doctest-output.stdout +++ b/src/test/rustdoc-ui/failed-doctest-output.stdout @@ -12,7 +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:323:13 +thread '$DIR/failed-doctest-output.rs - OtherStruct (line 27)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:327:13 note: Run with `RUST_BACKTRACE=1` for a backtrace. ---- $DIR/failed-doctest-output.rs - SomeStruct (line 21) stdout ---- @@ -21,7 +21,7 @@ thread '$DIR/failed-doctest-output.rs - SomeStruct (line 21)' panicked at 'test thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1 note: Run with `RUST_BACKTRACE=1` for a backtrace. -', src/librustdoc/test.rs:358:17 +', src/librustdoc/test.rs:362:17 failures: |