From f1969a1a1267c6de1b64edd7234ec8dbe7168e94 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 19 Nov 2020 19:44:15 +0100 Subject: Test fixes for 1.48 --- ui/single/locals-cfg.stderr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/single/locals-cfg.stderr') 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 -- cgit v1.2.3