From 5e5fbf0ee9b254ec7d61f3f820168f11cb6a2c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 3 Mar 2021 09:11:24 +0100 Subject: [PATCH] Fix the UI tests, remove panic_halt --- ui/locals-cfg.rs | 3 +- ui/locals-cfg.stderr | 26 +++++++--------- ui/resources-cfg.rs | 3 +- ui/resources-cfg.stderr | 66 +++++++++++++++++++---------------------- 4 files changed, 44 insertions(+), 54 deletions(-) diff --git a/ui/locals-cfg.rs b/ui/locals-cfg.rs index 72e2acae53..170d302610 100644 --- a/ui/locals-cfg.rs +++ b/ui/locals-cfg.rs @@ -1,5 +1,6 @@ #![no_main] -use panic_halt as _; + +use panic_semihosting as _; #[rtic::app(device = lm3s6965, dispatchers = [SSI0])] mod app { diff --git a/ui/locals-cfg.stderr b/ui/locals-cfg.stderr index 200cea20fe..33a80754e3 100644 --- a/ui/locals-cfg.stderr +++ b/ui/locals-cfg.stderr @@ -1,35 +1,29 @@ error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:11:9 + --> $DIR/locals-cfg.rs:12:9 | -11 | FOO; +12 | FOO; | ^^^ not found in this scope error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:21:9 + --> $DIR/locals-cfg.rs:22:9 | -21 | FOO; +22 | FOO; | ^^^ not found in this scope error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:31:9 + --> $DIR/locals-cfg.rs:32:9 | -31 | FOO; +32 | FOO; | ^^^ not found in this scope error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:39:9 + --> $DIR/locals-cfg.rs:40:9 | -39 | FOO; +40 | FOO; | ^^^ not found in this scope error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:47:9 + --> $DIR/locals-cfg.rs:48:9 | -47 | FOO; +48 | FOO; | ^^^ not found 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 /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-6f77337c1826707d.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-ad4cf7fac73711f1.rmeta diff --git a/ui/resources-cfg.rs b/ui/resources-cfg.rs index c11d2ba45d..c802a46f3b 100644 --- a/ui/resources-cfg.rs +++ b/ui/resources-cfg.rs @@ -1,5 +1,6 @@ #![no_main] -use panic_halt as _; + +use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { diff --git a/ui/resources-cfg.stderr b/ui/resources-cfg.stderr index 3bbbd2d9a8..03612de030 100644 --- a/ui/resources-cfg.stderr +++ b/ui/resources-cfg.stderr @@ -1,125 +1,119 @@ -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 /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-6f77337c1826707d.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-ad4cf7fac73711f1.rmeta - error[E0609]: no field `o1` on type `__rtic_internal_initResources<'_>` - --> $DIR/resources-cfg.rs:47:21 + --> $DIR/resources-cfg.rs:48:21 | -47 | c.resources.o1; +48 | c.resources.o1; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o4` on type `__rtic_internal_initResources<'_>` - --> $DIR/resources-cfg.rs:48:21 + --> $DIR/resources-cfg.rs:49:21 | -48 | c.resources.o4; +49 | c.resources.o4; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o5` on type `__rtic_internal_initResources<'_>` - --> $DIR/resources-cfg.rs:49:21 + --> $DIR/resources-cfg.rs:50:21 | -49 | c.resources.o5; +50 | c.resources.o5; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o6` on type `__rtic_internal_initResources<'_>` - --> $DIR/resources-cfg.rs:50:21 + --> $DIR/resources-cfg.rs:51:21 | -50 | c.resources.o6; +51 | c.resources.o6; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s3` on type `__rtic_internal_initResources<'_>` - --> $DIR/resources-cfg.rs:51:21 + --> $DIR/resources-cfg.rs:52:21 | -51 | c.resources.s3; +52 | c.resources.s3; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o2` on type `__rtic_internal_idleResources<'_>` - --> $DIR/resources-cfg.rs:58:21 + --> $DIR/resources-cfg.rs:59:21 | -58 | c.resources.o2; +59 | c.resources.o2; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o4` on type `__rtic_internal_idleResources<'_>` - --> $DIR/resources-cfg.rs:59:21 + --> $DIR/resources-cfg.rs:60:21 | -59 | c.resources.o4; +60 | c.resources.o4; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s1` on type `__rtic_internal_idleResources<'_>` - --> $DIR/resources-cfg.rs:60:21 + --> $DIR/resources-cfg.rs:61:21 | -60 | c.resources.s1; +61 | c.resources.s1; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s3` on type `__rtic_internal_idleResources<'_>` - --> $DIR/resources-cfg.rs:61:21 + --> $DIR/resources-cfg.rs:62:21 | -61 | c.resources.s3; +62 | c.resources.s3; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o3` on type `__rtic_internal_uart0Resources<'_>` - --> $DIR/resources-cfg.rs:68:21 + --> $DIR/resources-cfg.rs:69:21 | -68 | c.resources.o3; +69 | c.resources.o3; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s1` on type `__rtic_internal_uart0Resources<'_>` - --> $DIR/resources-cfg.rs:69:21 + --> $DIR/resources-cfg.rs:70:21 | -69 | c.resources.s1; +70 | c.resources.s1; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s2` on type `__rtic_internal_uart0Resources<'_>` - --> $DIR/resources-cfg.rs:70:21 + --> $DIR/resources-cfg.rs:71:21 | -70 | c.resources.s2; +71 | c.resources.s2; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s3` on type `__rtic_internal_uart0Resources<'_>` - --> $DIR/resources-cfg.rs:71:21 + --> $DIR/resources-cfg.rs:72:21 | -71 | c.resources.s3; +72 | c.resources.s3; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `s2` on type `__rtic_internal_uart1Resources<'_>` - --> $DIR/resources-cfg.rs:76:21 + --> $DIR/resources-cfg.rs:77:21 | -76 | c.resources.s2; +77 | c.resources.s2; | ^^ unknown field | = note: available fields are: `__marker__` error[E0609]: no field `o5` on type `__rtic_internal_uart1Resources<'_>` - --> $DIR/resources-cfg.rs:77:21 + --> $DIR/resources-cfg.rs:78:21 | -77 | c.resources.o5; +78 | c.resources.o5; | ^^ unknown field | = note: available fields are: `__marker__`