From 79b62797f549a71531bf5ede39cc6695871b7251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Wed, 22 Apr 2020 11:48:36 +0000
Subject: Update the test suite to use mod instead of const

Changes MSRV to 1.42, failing tests updated to match 1.42.
---
 ui/single/exception-invalid.rs           | 4 ++--
 ui/single/exception-systick-used.rs      | 4 ++--
 ui/single/extern-interrupt-not-enough.rs | 4 ++--
 ui/single/extern-interrupt-used.rs       | 4 ++--
 ui/single/locals-cfg.rs                  | 4 ++--
 ui/single/locals-cfg.stderr              | 8 ++++----
 ui/single/resources-cfg.rs               | 4 ++--
 ui/single/task-priority-too-high.rs      | 4 ++--
 ui/single/task-priority-too-high.stderr  | 2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'ui')

diff --git a/ui/single/exception-invalid.rs b/ui/single/exception-invalid.rs
index efe0621..9b6b001 100644
--- a/ui/single/exception-invalid.rs
+++ b/ui/single/exception-invalid.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     #[task(binds = NonMaskableInt)]
     fn nmi(_: nmi::Context) {}
-};
+}
diff --git a/ui/single/exception-systick-used.rs b/ui/single/exception-systick-used.rs
index 36ed174..02fd1c6 100644
--- a/ui/single/exception-systick-used.rs
+++ b/ui/single/exception-systick-used.rs
@@ -1,10 +1,10 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     #[task(binds = SysTick)]
     fn sys_tick(_: sys_tick::Context) {}
 
     #[task(schedule = [foo])]
     fn foo(_: foo::Context) {}
-};
+}
diff --git a/ui/single/extern-interrupt-not-enough.rs b/ui/single/extern-interrupt-not-enough.rs
index 53820b5..18850d8 100644
--- a/ui/single/extern-interrupt-not-enough.rs
+++ b/ui/single/extern-interrupt-not-enough.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     #[task]
     fn a(_: a::Context) {}
-};
+}
diff --git a/ui/single/extern-interrupt-used.rs b/ui/single/extern-interrupt-used.rs
index 82f1bdd..dd79843 100644
--- a/ui/single/extern-interrupt-used.rs
+++ b/ui/single/extern-interrupt-used.rs
@@ -1,11 +1,11 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     #[task(binds = UART0)]
     fn a(_: a::Context) {}
 
     extern "C" {
         fn UART0();
     }
-};
+}
diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs
index 54bba8a..5053cf3 100644
--- a/ui/single/locals-cfg.rs
+++ b/ui/single/locals-cfg.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     #[init]
     fn init(_: init::Context) {
         #[cfg(never)]
@@ -47,4 +47,4 @@ const APP: () = {
     extern "C" {
         fn UART1();
     }
-};
+}
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index bb558fa..e572a41 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`.
+  = note: first defined in crate `std` (which `$CRATE` depends on)
 
-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`.
diff --git a/ui/single/resources-cfg.rs b/ui/single/resources-cfg.rs
index df7ac80..fd03f58 100644
--- a/ui/single/resources-cfg.rs
+++ b/ui/single/resources-cfg.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     struct Resources {
         #[cfg(never)]
         #[init(0)]
@@ -72,4 +72,4 @@ const APP: () = {
         c.resources.s2;
         c.resources.o5;
     }
-};
+}
diff --git a/ui/single/task-priority-too-high.rs b/ui/single/task-priority-too-high.rs
index 539c3f5..ed7dd86 100644
--- a/ui/single/task-priority-too-high.rs
+++ b/ui/single/task-priority-too-high.rs
@@ -3,7 +3,7 @@
 use rtic::app;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod APP {
     #[init]
     fn init(_: init::Context) {}
 
@@ -35,4 +35,4 @@ const APP: () = {
     // this value is too high!
     #[task(binds = I2C0, priority = 9)]
     fn i2c0(_: i2c0::Context) {}
-};
+}
diff --git a/ui/single/task-priority-too-high.stderr b/ui/single/task-priority-too-high.stderr
index eae6074..5854ae5 100644
--- a/ui/single/task-priority-too-high.stderr
+++ b/ui/single/task-priority-too-high.stderr
@@ -4,7 +4,7 @@ warning: unused import: `rtic::app`
 3 | use rtic::app;
   |     ^^^^^^^^^
   |
-  = note: #[warn(unused_imports)] on by default
+  = note: `#[warn(unused_imports)]` on by default
 
 error[E0080]: evaluation of constant value failed
  --> $DIR/task-priority-too-high.rs:5:1
-- 
cgit v1.2.3


From 5cfd9b92384a6e2d352e35de9da1b7a2b53cc2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 19 May 2020 18:00:13 +0000
Subject: Modules using lower-case in examples

---
 ui/single/exception-invalid.rs           | 2 +-
 ui/single/exception-systick-used.rs      | 2 +-
 ui/single/extern-interrupt-not-enough.rs | 2 +-
 ui/single/extern-interrupt-used.rs       | 2 +-
 ui/single/locals-cfg.rs                  | 2 +-
 ui/single/resources-cfg.rs               | 2 +-
 ui/single/task-priority-too-high.rs      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/single/exception-invalid.rs b/ui/single/exception-invalid.rs
index 9b6b001..04d9bc7 100644
--- a/ui/single/exception-invalid.rs
+++ b/ui/single/exception-invalid.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     #[task(binds = NonMaskableInt)]
     fn nmi(_: nmi::Context) {}
 }
diff --git a/ui/single/exception-systick-used.rs b/ui/single/exception-systick-used.rs
index 02fd1c6..1c30b70 100644
--- a/ui/single/exception-systick-used.rs
+++ b/ui/single/exception-systick-used.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     #[task(binds = SysTick)]
     fn sys_tick(_: sys_tick::Context) {}
 
diff --git a/ui/single/extern-interrupt-not-enough.rs b/ui/single/extern-interrupt-not-enough.rs
index 18850d8..f262403 100644
--- a/ui/single/extern-interrupt-not-enough.rs
+++ b/ui/single/extern-interrupt-not-enough.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     #[task]
     fn a(_: a::Context) {}
 }
diff --git a/ui/single/extern-interrupt-used.rs b/ui/single/extern-interrupt-used.rs
index dd79843..89c2378 100644
--- a/ui/single/extern-interrupt-used.rs
+++ b/ui/single/extern-interrupt-used.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     #[task(binds = UART0)]
     fn a(_: a::Context) {}
 
diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs
index 5053cf3..7ec46ac 100644
--- a/ui/single/locals-cfg.rs
+++ b/ui/single/locals-cfg.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     #[init]
     fn init(_: init::Context) {
         #[cfg(never)]
diff --git a/ui/single/resources-cfg.rs b/ui/single/resources-cfg.rs
index fd03f58..e41ce42 100644
--- a/ui/single/resources-cfg.rs
+++ b/ui/single/resources-cfg.rs
@@ -1,7 +1,7 @@
 #![no_main]
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     struct Resources {
         #[cfg(never)]
         #[init(0)]
diff --git a/ui/single/task-priority-too-high.rs b/ui/single/task-priority-too-high.rs
index ed7dd86..c01d685 100644
--- a/ui/single/task-priority-too-high.rs
+++ b/ui/single/task-priority-too-high.rs
@@ -3,7 +3,7 @@
 use rtic::app;
 
 #[rtic::app(device = lm3s6965)]
-mod APP {
+mod app {
     #[init]
     fn init(_: init::Context) {}
 
-- 
cgit v1.2.3


From ec936c3b51801280ee6edb365b784d515382b6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Fri, 25 Sep 2020 13:59:04 +0000
Subject: Update test suite output

---
 ui/single/locals-cfg.stderr             | 12 ++++++++----
 ui/single/task-priority-too-high.rs     |  2 --
 ui/single/task-priority-too-high.stderr | 16 +++++-----------
 3 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'ui')

diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index e572a41..7637159 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -28,10 +28,14 @@ error[E0425]: cannot find value `FOO` in this scope
 44 |         FOO;
    |         ^^^ not found in this scope
 
-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 `std` (which `$CRATE` depends on)
+  = 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-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_halt`: `panic_impl`.
+error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
   |
-  = note: first defined in crate `panic_semihosting`.
+  = note: the lang item is first defined in crate `panic_halt`.
+  = 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
diff --git a/ui/single/task-priority-too-high.rs b/ui/single/task-priority-too-high.rs
index c01d685..fbafa4d 100644
--- a/ui/single/task-priority-too-high.rs
+++ b/ui/single/task-priority-too-high.rs
@@ -1,7 +1,5 @@
 #![no_main]
 
-use rtic::app;
-
 #[rtic::app(device = lm3s6965)]
 mod app {
     #[init]
diff --git a/ui/single/task-priority-too-high.stderr b/ui/single/task-priority-too-high.stderr
index 5854ae5..e84ddd3 100644
--- a/ui/single/task-priority-too-high.stderr
+++ b/ui/single/task-priority-too-high.stderr
@@ -1,13 +1,7 @@
-warning: unused import: `rtic::app`
- --> $DIR/task-priority-too-high.rs:3:5
-  |
-3 | use rtic::app;
-  |     ^^^^^^^^^
-  |
-  = note: `#[warn(unused_imports)]` on by default
-
 error[E0080]: evaluation of constant value failed
- --> $DIR/task-priority-too-high.rs:5:1
+ --> $DIR/task-priority-too-high.rs:3:1
+  |
+3 | #[rtic::app(device = lm3s6965)]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `8_usize - 9_usize` which would overflow
   |
-5 | #[rtic::app(device = lm3s6965)]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
-- 
cgit v1.2.3


From adff844b8c09e83b4a69fc5b7ac9bd133f09dbbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 4 Jun 2020 15:33:35 +0000
Subject: Add #[resources] to ui/single

---
 ui/single/resources-cfg.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui')

diff --git a/ui/single/resources-cfg.rs b/ui/single/resources-cfg.rs
index e41ce42..163927e 100644
--- a/ui/single/resources-cfg.rs
+++ b/ui/single/resources-cfg.rs
@@ -2,6 +2,7 @@
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    #[resources]
     struct Resources {
         #[cfg(never)]
         #[init(0)]
-- 
cgit v1.2.3


From 506e411be6b325b75e9de58c9b21b11032a7c3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 4 Jun 2020 16:56:13 +0000
Subject: Update run-pass tests for stable

---
 ui/single/locals-cfg.stderr    |  8 +++---
 ui/single/resources-cfg.stderr | 60 +++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'ui')

diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index 7637159..145e7fd 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -31,11 +31,11 @@ error[E0425]: cannot find value `FOO` in this scope
 error: duplicate lang item in crate `panic_halt`: `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-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
+  = note: first definition in `std` loaded from /home/henrik/.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/debug/deps/libpanic_halt-b597cb793434f3ed.rmeta
 
 error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
   |
   = note: the lang item is first defined in crate `panic_halt`.
-  = 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: first definition in `panic_halt` loaded from $DIR/target/tests/target/debug/deps/libpanic_halt-b597cb793434f3ed.rmeta
+  = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/debug/deps/libpanic_semihosting-2c8f1ababc34800c.rmeta
diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr
index c47b95d..f1518a4 100644
--- a/ui/single/resources-cfg.stderr
+++ b/ui/single/resources-cfg.stderr
@@ -1,119 +1,119 @@
 error[E0609]: no field `o1` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:45:21
+  --> $DIR/resources-cfg.rs:46:21
    |
-45 |         c.resources.o1;
+46 |         c.resources.o1;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o4` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:46:21
+  --> $DIR/resources-cfg.rs:47:21
    |
-46 |         c.resources.o4;
+47 |         c.resources.o4;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o5` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:47:21
+  --> $DIR/resources-cfg.rs:48:21
    |
-47 |         c.resources.o5;
+48 |         c.resources.o5;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o6` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:48:21
+  --> $DIR/resources-cfg.rs:49:21
    |
-48 |         c.resources.o6;
+49 |         c.resources.o6;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s3` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:49:21
+  --> $DIR/resources-cfg.rs:50:21
    |
-49 |         c.resources.s3;
+50 |         c.resources.s3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o2` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:54:21
+  --> $DIR/resources-cfg.rs:55:21
    |
-54 |         c.resources.o2;
+55 |         c.resources.o2;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o4` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:55:21
+  --> $DIR/resources-cfg.rs:56:21
    |
-55 |         c.resources.o4;
+56 |         c.resources.o4;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s1` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:56:21
+  --> $DIR/resources-cfg.rs:57:21
    |
-56 |         c.resources.s1;
+57 |         c.resources.s1;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s3` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:57:21
+  --> $DIR/resources-cfg.rs:58:21
    |
-57 |         c.resources.s3;
+58 |         c.resources.s3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o3` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:64:21
+  --> $DIR/resources-cfg.rs:65:21
    |
-64 |         c.resources.o3;
+65 |         c.resources.o3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s1` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:65:21
+  --> $DIR/resources-cfg.rs:66:21
    |
-65 |         c.resources.s1;
+66 |         c.resources.s1;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s2` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:66:21
+  --> $DIR/resources-cfg.rs:67:21
    |
-66 |         c.resources.s2;
+67 |         c.resources.s2;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s3` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:67:21
+  --> $DIR/resources-cfg.rs:68:21
    |
-67 |         c.resources.s3;
+68 |         c.resources.s3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s2` on type `uart1Resources<'_>`
-  --> $DIR/resources-cfg.rs:72:21
+  --> $DIR/resources-cfg.rs:73:21
    |
-72 |         c.resources.s2;
+73 |         c.resources.s2;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o5` on type `uart1Resources<'_>`
-  --> $DIR/resources-cfg.rs:73:21
+  --> $DIR/resources-cfg.rs:74:21
    |
-73 |         c.resources.o5;
+74 |         c.resources.o5;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
-- 
cgit v1.2.3


From d7bd8c838a5c4e1ae6d28fa60e5e5969acbe1db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Mon, 8 Jun 2020 08:06:09 +0000
Subject: Import panic_halt so semihosting is not attempted

ARMv6 would otherwise differ in output compared to ARMv7
---
 ui/single/locals-cfg.rs        |  1 +
 ui/single/locals-cfg.stderr    | 24 +++++++--------
 ui/single/resources-cfg.rs     |  1 +
 ui/single/resources-cfg.stderr | 66 +++++++++++++++++++++++-------------------
 4 files changed, 50 insertions(+), 42 deletions(-)

(limited to 'ui')

diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs
index 7ec46ac..e04e5b9 100644
--- a/ui/single/locals-cfg.rs
+++ b/ui/single/locals-cfg.rs
@@ -1,4 +1,5 @@
 #![no_main]
+use panic_halt as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index 145e7fd..c26a334 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -1,34 +1,34 @@
 error[E0425]: cannot find value `FOO` in this scope
-  --> $DIR/locals-cfg.rs:10:9
+  --> $DIR/locals-cfg.rs:11:9
    |
-10 |         FOO;
+11 |         FOO;
    |         ^^^ not found in this scope
 
 error[E0425]: cannot find value `FOO` in this scope
-  --> $DIR/locals-cfg.rs:18:9
+  --> $DIR/locals-cfg.rs:19:9
    |
-18 |         FOO;
+19 |         FOO;
    |         ^^^ not found in this scope
 
 error[E0425]: cannot find value `FOO` in this scope
-  --> $DIR/locals-cfg.rs:28:9
+  --> $DIR/locals-cfg.rs:29:9
    |
-28 |         FOO;
+29 |         FOO;
    |         ^^^ not found in this scope
 
 error[E0425]: cannot find value `FOO` in this scope
-  --> $DIR/locals-cfg.rs:36:9
+  --> $DIR/locals-cfg.rs:37:9
    |
-36 |         FOO;
+37 |         FOO;
    |         ^^^ not found in this scope
 
 error[E0425]: cannot find value `FOO` in this scope
-  --> $DIR/locals-cfg.rs:44:9
+  --> $DIR/locals-cfg.rs:45:9
    |
-44 |         FOO;
+45 |         FOO;
    |         ^^^ not found in this scope
 
-error: duplicate lang item in crate `panic_halt`: `panic_impl`.
+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 /home/henrik/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-cf0f33af3a901778.rlib
@@ -36,6 +36,6 @@ error: duplicate lang item in crate `panic_halt`: `panic_impl`.
 
 error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
   |
-  = note: the lang item is first defined in crate `panic_halt`.
+  = 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/debug/deps/libpanic_halt-b597cb793434f3ed.rmeta
   = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/debug/deps/libpanic_semihosting-2c8f1ababc34800c.rmeta
diff --git a/ui/single/resources-cfg.rs b/ui/single/resources-cfg.rs
index 163927e..f2569e9 100644
--- a/ui/single/resources-cfg.rs
+++ b/ui/single/resources-cfg.rs
@@ -1,4 +1,5 @@
 #![no_main]
+use panic_halt as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr
index f1518a4..530c782 100644
--- a/ui/single/resources-cfg.stderr
+++ b/ui/single/resources-cfg.stderr
@@ -1,119 +1,125 @@
+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 /home/henrik/.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/debug/deps/libpanic_halt-b597cb793434f3ed.rmeta
+
 error[E0609]: no field `o1` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:46:21
+  --> $DIR/resources-cfg.rs:47:21
    |
-46 |         c.resources.o1;
+47 |         c.resources.o1;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o4` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:47:21
+  --> $DIR/resources-cfg.rs:48:21
    |
-47 |         c.resources.o4;
+48 |         c.resources.o4;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o5` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:48:21
+  --> $DIR/resources-cfg.rs:49:21
    |
-48 |         c.resources.o5;
+49 |         c.resources.o5;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o6` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:49:21
+  --> $DIR/resources-cfg.rs:50:21
    |
-49 |         c.resources.o6;
+50 |         c.resources.o6;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s3` on type `initResources<'_>`
-  --> $DIR/resources-cfg.rs:50:21
+  --> $DIR/resources-cfg.rs:51:21
    |
-50 |         c.resources.s3;
+51 |         c.resources.s3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o2` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:55:21
+  --> $DIR/resources-cfg.rs:56:21
    |
-55 |         c.resources.o2;
+56 |         c.resources.o2;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o4` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:56:21
+  --> $DIR/resources-cfg.rs:57:21
    |
-56 |         c.resources.o4;
+57 |         c.resources.o4;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s1` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:57:21
+  --> $DIR/resources-cfg.rs:58:21
    |
-57 |         c.resources.s1;
+58 |         c.resources.s1;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s3` on type `idleResources<'_>`
-  --> $DIR/resources-cfg.rs:58:21
+  --> $DIR/resources-cfg.rs:59:21
    |
-58 |         c.resources.s3;
+59 |         c.resources.s3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o3` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:65:21
+  --> $DIR/resources-cfg.rs:66:21
    |
-65 |         c.resources.o3;
+66 |         c.resources.o3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s1` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:66:21
+  --> $DIR/resources-cfg.rs:67:21
    |
-66 |         c.resources.s1;
+67 |         c.resources.s1;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s2` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:67:21
+  --> $DIR/resources-cfg.rs:68:21
    |
-67 |         c.resources.s2;
+68 |         c.resources.s2;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s3` on type `uart0Resources<'_>`
-  --> $DIR/resources-cfg.rs:68:21
+  --> $DIR/resources-cfg.rs:69:21
    |
-68 |         c.resources.s3;
+69 |         c.resources.s3;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `s2` on type `uart1Resources<'_>`
-  --> $DIR/resources-cfg.rs:73:21
+  --> $DIR/resources-cfg.rs:74:21
    |
-73 |         c.resources.s2;
+74 |         c.resources.s2;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
 
 error[E0609]: no field `o5` on type `uart1Resources<'_>`
-  --> $DIR/resources-cfg.rs:74:21
+  --> $DIR/resources-cfg.rs:75:21
    |
-74 |         c.resources.o5;
+75 |         c.resources.o5;
    |                     ^^ unknown field
    |
    = note: available fields are: `__marker__`
-- 
cgit v1.2.3


From b4ec6f5eff212dee6aa1523653262980bc676c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 29 Sep 2020 12:01:36 +0000
Subject: Fix test output to match GHA runner

---
 ui/single/locals-cfg.stderr    | 8 ++++----
 ui/single/resources-cfg.stderr | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ui')

diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index c26a334..39d56df 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -31,11 +31,11 @@ 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 /home/henrik/.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/debug/deps/libpanic_halt-b597cb793434f3ed.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-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`.
   |
   = 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/debug/deps/libpanic_halt-b597cb793434f3ed.rmeta
-  = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/debug/deps/libpanic_semihosting-2c8f1ababc34800c.rmeta
+  = 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
diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr
index 530c782..9c39e56 100644
--- a/ui/single/resources-cfg.stderr
+++ b/ui/single/resources-cfg.stderr
@@ -1,8 +1,8 @@
 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 /home/henrik/.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/debug/deps/libpanic_halt-b597cb793434f3ed.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-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[E0609]: no field `o1` on type `initResources<'_>`
   --> $DIR/resources-cfg.rs:47:21
-- 
cgit v1.2.3


From 65522e407778c38f86f4d3252b46fe54ed5909e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Fri, 2 Oct 2020 11:50:34 +0000
Subject: Update ui-test

---
 ui/single/locals-cfg.stderr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index 1b46cea..39d56df 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_halt`: `panic_impl`.
+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-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
\ No newline at end of file
+  = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_semihosting-805015f4a2d05965.rmeta
-- 
cgit v1.2.3