diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-01 18:45:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 18:45:04 +0000 |
| commit | decd9112d8267d9e886dcc4470e46a764139c8e3 (patch) | |
| tree | ea85444bd80cde6fe21197b0a06523be515fdfa8 /ui | |
| parent | 4d61437bb4debea5adc578ee072bff3619d8077b (diff) | |
| parent | 86001c46bcae85c9448d63dde534bd218301f0e4 (diff) | |
Merge #373
373: Added `bare_metal::CriticalSection` to `init::Context` r=AfoHT a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/single/locals-cfg.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index bb558fa..49695cb 100644 --- a/ui/single/locals-cfg.stderr +++ b/ui/single/locals-cfg.stderr @@ -28,10 +28,10 @@ error[E0425]: cannot find value `FOO` in this scope 44 | FOO; | ^^^ not found in this scope -error: duplicate lang item in crate `panic_halt`: `panic_impl`. +error: duplicate lang item in crate `panic_semihosting`: `panic_impl`. | = note: first defined in crate `std`. -error: duplicate lang item in crate `panic_semihosting`: `panic_impl`. +error: duplicate lang item in crate `panic_halt`: `panic_impl`. | - = note: first defined in crate `panic_halt`. + = note: first defined in crate `panic_semihosting`. |