aboutsummaryrefslogtreecommitdiff
path: root/ui/single
diff options
context:
space:
mode:
authorHenrik Tjäder <henrik@tjaders.com>2020-10-02 09:43:03 +0000
committerHenrik Tjäder <henrik@tjaders.com>2020-10-02 09:43:03 +0000
commit755bb191b6ccd9b3abeca7a0a9b02218caba3a99 (patch)
tree11a8b27dd807577b826e4292a3d6c4fe3e8b0470 /ui/single
parente6bc673621093c72f932cc38043c9fa951745450 (diff)
parent1e46ffdfbc4e2b088334e1730ba8bdfdaad33a2f (diff)
Merge branch 'mod_const' of github.com:AfoHT/cortex-m-rtic into mod_const
Diffstat (limited to 'ui/single')
-rw-r--r--ui/single/locals-cfg.stderr4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index 39d56df..1b46cea 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -34,8 +34,8 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `p
= 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-cf0f33af3a901778.rlib
= note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-ba6f0ab3439cbc7e.rmeta
-error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
+error: duplicate lang item in crate `panic_halt`: `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-ba6f0ab3439cbc7e.rmeta
- = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_semihosting-805015f4a2d05965.rmeta
+ = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_semihosting-805015f4a2d05965.rmeta \ No newline at end of file