From f1969a1a1267c6de1b64edd7234ec8dbe7168e94 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 19 Nov 2020 19:44:15 +0100 Subject: [PATCH] Test fixes for 1.48 --- ui/single/locals-cfg.stderr | 4 +-- ui/single/resources-cfg.stderr | 34 ++++++++++++------------- ui/single/task-priority-too-high.stderr | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index 0af1293f25..9319ab4650 100644 --- a/ui/single/locals-cfg.stderr +++ b/ui/single/locals-cfg.stderr @@ -31,5 +31,5 @@ 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 /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-f14aca24435a5414.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.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-93cbfed54dd1bac8.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr index f47b13535d..e0b82b9391 100644 --- a/ui/single/resources-cfg.stderr +++ b/ui/single/resources-cfg.stderr @@ -1,10 +1,10 @@ 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-f14aca24435a5414.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.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-93cbfed54dd1bac8.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta -error[E0609]: no field `o1` on type `app::initResources<'_>` +error[E0609]: no field `o1` on type `initResources<'_>` --> $DIR/resources-cfg.rs:47:21 | 47 | c.resources.o1; @@ -12,7 +12,7 @@ error[E0609]: no field `o1` on type `app::initResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o4` on type `app::initResources<'_>` +error[E0609]: no field `o4` on type `initResources<'_>` --> $DIR/resources-cfg.rs:48:21 | 48 | c.resources.o4; @@ -20,7 +20,7 @@ error[E0609]: no field `o4` on type `app::initResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o5` on type `app::initResources<'_>` +error[E0609]: no field `o5` on type `initResources<'_>` --> $DIR/resources-cfg.rs:49:21 | 49 | c.resources.o5; @@ -28,7 +28,7 @@ error[E0609]: no field `o5` on type `app::initResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o6` on type `app::initResources<'_>` +error[E0609]: no field `o6` on type `initResources<'_>` --> $DIR/resources-cfg.rs:50:21 | 50 | c.resources.o6; @@ -36,7 +36,7 @@ error[E0609]: no field `o6` on type `app::initResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s3` on type `app::initResources<'_>` +error[E0609]: no field `s3` on type `initResources<'_>` --> $DIR/resources-cfg.rs:51:21 | 51 | c.resources.s3; @@ -44,7 +44,7 @@ error[E0609]: no field `s3` on type `app::initResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o2` on type `app::idleResources<'_>` +error[E0609]: no field `o2` on type `idleResources<'_>` --> $DIR/resources-cfg.rs:58:21 | 58 | c.resources.o2; @@ -52,7 +52,7 @@ error[E0609]: no field `o2` on type `app::idleResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o4` on type `app::idleResources<'_>` +error[E0609]: no field `o4` on type `idleResources<'_>` --> $DIR/resources-cfg.rs:59:21 | 59 | c.resources.o4; @@ -60,7 +60,7 @@ error[E0609]: no field `o4` on type `app::idleResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s1` on type `app::idleResources<'_>` +error[E0609]: no field `s1` on type `idleResources<'_>` --> $DIR/resources-cfg.rs:60:21 | 60 | c.resources.s1; @@ -68,7 +68,7 @@ error[E0609]: no field `s1` on type `app::idleResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s3` on type `app::idleResources<'_>` +error[E0609]: no field `s3` on type `idleResources<'_>` --> $DIR/resources-cfg.rs:61:21 | 61 | c.resources.s3; @@ -76,7 +76,7 @@ error[E0609]: no field `s3` on type `app::idleResources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o3` on type `app::uart0Resources<'_>` +error[E0609]: no field `o3` on type `uart0Resources<'_>` --> $DIR/resources-cfg.rs:68:21 | 68 | c.resources.o3; @@ -84,7 +84,7 @@ error[E0609]: no field `o3` on type `app::uart0Resources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s1` on type `app::uart0Resources<'_>` +error[E0609]: no field `s1` on type `uart0Resources<'_>` --> $DIR/resources-cfg.rs:69:21 | 69 | c.resources.s1; @@ -92,7 +92,7 @@ error[E0609]: no field `s1` on type `app::uart0Resources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s2` on type `app::uart0Resources<'_>` +error[E0609]: no field `s2` on type `uart0Resources<'_>` --> $DIR/resources-cfg.rs:70:21 | 70 | c.resources.s2; @@ -100,7 +100,7 @@ error[E0609]: no field `s2` on type `app::uart0Resources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s3` on type `app::uart0Resources<'_>` +error[E0609]: no field `s3` on type `uart0Resources<'_>` --> $DIR/resources-cfg.rs:71:21 | 71 | c.resources.s3; @@ -108,7 +108,7 @@ error[E0609]: no field `s3` on type `app::uart0Resources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `s2` on type `app::uart1Resources<'_>` +error[E0609]: no field `s2` on type `uart1Resources<'_>` --> $DIR/resources-cfg.rs:76:21 | 76 | c.resources.s2; @@ -116,7 +116,7 @@ error[E0609]: no field `s2` on type `app::uart1Resources<'_>` | = note: available fields are: `__marker__` -error[E0609]: no field `o5` on type `app::uart1Resources<'_>` +error[E0609]: no field `o5` on type `uart1Resources<'_>` --> $DIR/resources-cfg.rs:77:21 | 77 | c.resources.o5; diff --git a/ui/single/task-priority-too-high.stderr b/ui/single/task-priority-too-high.stderr index e84ddd3cd4..984d3fac24 100644 --- a/ui/single/task-priority-too-high.stderr +++ b/ui/single/task-priority-too-high.stderr @@ -2,6 +2,6 @@ error[E0080]: evaluation of constant value failed --> $DIR/task-priority-too-high.rs:3:1 | 3 | #[rtic::app(device = lm3s6965)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `8_usize - 9_usize` which would overflow + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `8_usize - 9_usize`, which would overflow | = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)