diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-19 18:54:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 18:54:29 +0000 |
| commit | 25919437e48a8f6bee68314b760f715dc48780e7 (patch) | |
| tree | bd23878c8216f988be164eec041b05bacde1130a /ui/single/locals-cfg.stderr | |
| parent | 8460a978fe5af10a5d8fed4c213b1fe6b9627737 (diff) | |
| parent | f1969a1a1267c6de1b64edd7234ec8dbe7168e94 (diff) | |
Merge #425
425: Test fixes for 1.48 r=AfoHT a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'ui/single/locals-cfg.stderr')
| -rw-r--r-- | ui/single/locals-cfg.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index 0af1293..9319ab4 100644 --- a/ui/single/locals-cfg.stderr +++ b/ui/single/locals-cfg.stderr @@ -31,5 +31,5 @@ error[E0425]: cannot find value `FOO` in this scope error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-f14aca24435a5414.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta |