From 9a76c9337a34ca1c1fd6576e74b5c5196afea9fb Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Tue, 9 Oct 2018 23:05:20 +0200 Subject: [PATCH 1/2] Use default of preferring static over dynamic linking in rustdoc tests. --- src/librustdoc/test.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index dbebc3ab39397..d74e5c2ca6401 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -220,7 +220,6 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize, output_types: outputs, externs, cg: config::CodegenOptions { - prefer_dynamic: true, linker, ..cg }, From cbca68834148f29cb71e30b2b828440f2eb57e39 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 9 Oct 2018 15:02:55 -0700 Subject: [PATCH 2/2] Update a rustdoc ui test whose output has changed --- src/test/rustdoc-ui/failed-doctest-output.stdout | 4 ++-- 1 file 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 dbc65569afa87..cf417f8d412ee 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: