mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-27 14:04:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #425

Browse source 
425: Test fixes for 1.48 r=AfoHT a=korken89



Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
This commit is contained in:
bors[bot] 2020-11-19 18:54:29 +00:00 committed by GitHub
commit 25919437e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/single/locals-cfg.stderr
View file

@ -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`. 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: 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: 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-33949299fdfa2375.rmeta = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta

34
ui/single/resources-cfg.stderr
View file

@ -1,10 +1,10 @@
error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `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: 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: 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-33949299fdfa2375.rmeta = 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 --> $DIR/resources-cfg.rs:47:21
| |
47 | c.resources.o1; 47 | c.resources.o1;
@ -12,7 +12,7 @@ error[E0609]: no field `o1` on type `app::initResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:48:21
| |
48 | c.resources.o4; 48 | c.resources.o4;
@ -20,7 +20,7 @@ error[E0609]: no field `o4` on type `app::initResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:49:21
| |
49 | c.resources.o5; 49 | c.resources.o5;
@ -28,7 +28,7 @@ error[E0609]: no field `o5` on type `app::initResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:50:21
| |
50 | c.resources.o6; 50 | c.resources.o6;
@ -36,7 +36,7 @@ error[E0609]: no field `o6` on type `app::initResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:51:21
| |
51 | c.resources.s3; 51 | c.resources.s3;
@ -44,7 +44,7 @@ error[E0609]: no field `s3` on type `app::initResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:58:21
| |
58 | c.resources.o2; 58 | c.resources.o2;
@ -52,7 +52,7 @@ error[E0609]: no field `o2` on type `app::idleResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:59:21
| |
59 | c.resources.o4; 59 | c.resources.o4;
@ -60,7 +60,7 @@ error[E0609]: no field `o4` on type `app::idleResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:60:21
| |
60 | c.resources.s1; 60 | c.resources.s1;
@ -68,7 +68,7 @@ error[E0609]: no field `s1` on type `app::idleResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:61:21
| |
61 | c.resources.s3; 61 | c.resources.s3;
@ -76,7 +76,7 @@ error[E0609]: no field `s3` on type `app::idleResources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:68:21
| |
68 | c.resources.o3; 68 | c.resources.o3;
@ -84,7 +84,7 @@ error[E0609]: no field `o3` on type `app::uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:69:21
| |
69 | c.resources.s1; 69 | c.resources.s1;
@ -92,7 +92,7 @@ error[E0609]: no field `s1` on type `app::uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:70:21
| |
70 | c.resources.s2; 70 | c.resources.s2;
@ -100,7 +100,7 @@ error[E0609]: no field `s2` on type `app::uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:71:21
| |
71 | c.resources.s3; 71 | c.resources.s3;
@ -108,7 +108,7 @@ error[E0609]: no field `s3` on type `app::uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:76:21
| |
76 | c.resources.s2; 76 | c.resources.s2;
@ -116,7 +116,7 @@ error[E0609]: no field `s2` on type `app::uart1Resources<'_>`
| |
= note: available fields are: `__marker__` = 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 --> $DIR/resources-cfg.rs:77:21
| |
77 | c.resources.o5; 77 | c.resources.o5;

2
ui/single/task-priority-too-high.stderr
View file

@ -2,6 +2,6 @@ error[E0080]: evaluation of constant value failed
--> $DIR/task-priority-too-high.rs:3:1 --> $DIR/task-priority-too-high.rs:3:1
| |
3 | #[rtic::app(device = lm3s6965)] 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) = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)