diff options
| author |  Henrik Tjäder <henrik@tjaders.com>
| 2020-10-02 11:36:28 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-02 11:36:28 +0200 |
| commit | 1e46ffdfbc4e2b088334e1730ba8bdfdaad33a2f (patch) | |
| tree | 004536122e43c657c97453524b2d76093b5637c3 /ui/single | |
| parent | 9ca10b0d8c735a06a3a0a3623a7fc5d09b5e948c (diff) | |
| parent | 4981af8a4bfe5ee5442521794d851b0dc0313488 (diff) | |
| download | rtic-1e46ffdfbc4e2b088334e1730ba8bdfdaad33a2f.tar.gz rtic-1e46ffdfbc4e2b088334e1730ba8bdfdaad33a2f.tar.zst rtic-1e46ffdfbc4e2b088334e1730ba8bdfdaad33a2f.zip | |
Merge branch 'master' into mod_const
Diffstat (limited to 'ui/single')
| -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 39d56df2..1b46cea7 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 |