aboutsummaryrefslogtreecommitdiff
path: root/ui/single
diff options
context:
space:
mode:
authorEmil Fresk <emil.fresk@gmail.com>2020-10-15 17:55:00 +0200
committerEmil Fresk <emil.fresk@gmail.com>2020-10-15 17:55:00 +0200
commit5ac16f6aae7c4760711b1eef5cbaf1c57c5933ca (patch)
treead2e1b0ac81f3ffebe73edcf62b8cc4472eaff13 /ui/single
parent5b8e6a22ab68e316e11641dedf5b39e20878c7b7 (diff)
parentee0885063d5b1cc4eddd3918ff425796f6213464 (diff)
Merge branch 'master' into spawn_experiment
Diffstat (limited to 'ui/single')
-rw-r--r--ui/single/locals-cfg.stderr6
1 files changed, 0 insertions, 6 deletions
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index 53cdacc..0af1293 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -33,9 +33,3 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `p
= 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
-
-error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
- |
- = note: the lang item is first defined in crate `panic_halt` (which `$CRATE` depends on)
- = note: first definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta
- = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_semihosting-f97442f9ee5cfc78.rmeta