diff options
| author | bors <bors@rust-lang.org> | 2018-11-22 15:54:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-22 15:54:10 +0000 |
| commit | c08840d5c3e6fa29b0fa734ad4405455f2e4c879 (patch) | |
| tree | 2a0acd1d8a4e33869861b232ddc804c1c3082d08 /src/test/rustdoc-ui | |
| parent | dae6c9364108847393075b57a17fd7eaf3f37600 (diff) | |
| parent | 7c166f54b201dbefe27d4ab61dfdf640ac3a2722 (diff) | |
| download | rust-c08840d5c3e6fa29b0fa734ad4405455f2e4c879.tar.gz rust-c08840d5c3e6fa29b0fa734ad4405455f2e4c879.zip | |
Auto merge of #53586 - eddyb:top-lock, r=alexcrichton
Move Cargo.{toml,lock} to the repository root directory.
This should give us back `src/` in errors, panics and debuginfo, for free.
r? @Mark-Simulacrum @alexcrichton cc @michaelwoerister
Diffstat (limited to 'src/test/rustdoc-ui')
| -rw-r--r-- | src/test/rustdoc-ui/failed-doctest-output.stdout | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/src/test/rustdoc-ui/failed-doctest-output.stdout index 527f1355a9e..cab7bda6c67 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', 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:323: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. -', librustdoc/test.rs:358:17 +', src/librustdoc/test.rs:358:17 failures: |