diff options
| author | bors <bors@rust-lang.org> | 2018-10-17 06:42:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-17 06:42:15 +0000 |
| commit | 9d7f0da367bae7587ed0ef69bd4384392099fc9e (patch) | |
| tree | 9368a72c231a8a9496e70947fb06de0834bc8993 /src/test | |
| parent | 37ba1071c626c43a5b85752b4ffcf6a87e2b745e (diff) | |
| parent | cbca68834148f29cb71e30b2b828440f2eb57e39 (diff) | |
| download | rust-9d7f0da367bae7587ed0ef69bd4384392099fc9e.tar.gz rust-9d7f0da367bae7587ed0ef69bd4384392099fc9e.zip | |
Auto merge of #54939 - pnkfelix:issue-54478-dont-prefer-dynamic-in-doc-tests, r=QuietMisdreavus
rustdoc: don't prefer dynamic linking in doc tests This is an attempt to address the regression in #54478 This may be a case where the cure is worse than the disease, at least in the short term... cc @alexcrichton
Diffstat (limited to 'src/test')
| -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 dbc65569afa..cf417f8d412 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 26)' panicked at 'couldn't compile the test', librustdoc/test.rs:333:13 +thread '$DIR/failed-doctest-output.rs - OtherStruct (line 26)' panicked at 'couldn't compile the test', librustdoc/test.rs:332:13 note: Run with `RUST_BACKTRACE=1` for a backtrace. ---- $DIR/failed-doctest-output.rs - SomeStruct (line 20) stdout ---- @@ -21,7 +21,7 @@ thread '$DIR/failed-doctest-output.rs - SomeStruct (line 20)' 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:368:17 +', librustdoc/test.rs:367:17 failures: |