mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix UI tests

Browse source 
Fix
This commit is contained in:
Emil Fresk 2020-10-21 20:33:55 +02:00
parent d2ac641c3f
commit 17e976ab49
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/static.rs
View file

@ -21,7 +21,7 @@ mod app {
// Late resources // Late resources
#[resources] #[resources]
struct Resources { struct Resources {
ppppp: Producer<'static, u32, U4>, p: Producer<'static, u32, U4>,
c: Consumer<'static, u32, U4>, c: Consumer<'static, u32, U4>,
} }
@ -29,10 +29,10 @@ mod app {
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> init::LateResources {
static mut Q: Queue<u32, U4> = Queue(i::Queue::new()); static mut Q: Queue<u32, U4> = Queue(i::Queue::new());
let (ppppp, c) = Q.split(); let (p, c) = Q.split();
// Initialization of late resources // Initialization of late resources
init::LateResources { ppppp, c } init::LateResources { p, c }
} }
#[idle(resources = [c])] #[idle(resources = [c])]
@ -48,10 +48,10 @@ mod app {
} }
} }
#[task(binds = UART0, resources = [ppppp])] #[task(binds = UART0, resources = [p])]
fn uart0(c: uart0::Context) { fn uart0(c: uart0::Context) {
static mut KALLE: u32 = 0; static mut KALLE: u32 = 0;
*KALLE += 1; *KALLE += 1;
c.resources.ppppp.enqueue(42).unwrap(); c.resources.p.enqueue(42).unwrap();
} }
} }

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

@ -4,7 +4,7 @@ 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-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-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: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta
error[E0609]: no field `o1` on type `initResources<'_>` error[E0609]: no field `o1` on type `app::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 `initResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o4` on type `initResources<'_>` error[E0609]: no field `o4` on type `app::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 `initResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o5` on type `initResources<'_>` error[E0609]: no field `o5` on type `app::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 `initResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o6` on type `initResources<'_>` error[E0609]: no field `o6` on type `app::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 `initResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s3` on type `initResources<'_>` error[E0609]: no field `s3` on type `app::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 `initResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o2` on type `idleResources<'_>` error[E0609]: no field `o2` on type `app::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 `idleResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o4` on type `idleResources<'_>` error[E0609]: no field `o4` on type `app::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 `idleResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s1` on type `idleResources<'_>` error[E0609]: no field `s1` on type `app::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 `idleResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s3` on type `idleResources<'_>` error[E0609]: no field `s3` on type `app::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 `idleResources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o3` on type `uart0Resources<'_>` error[E0609]: no field `o3` on type `app::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 `uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s1` on type `uart0Resources<'_>` error[E0609]: no field `s1` on type `app::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 `uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s2` on type `uart0Resources<'_>` error[E0609]: no field `s2` on type `app::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 `uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s3` on type `uart0Resources<'_>` error[E0609]: no field `s3` on type `app::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 `uart0Resources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `s2` on type `uart1Resources<'_>` error[E0609]: no field `s2` on type `app::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 `uart1Resources<'_>`
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error[E0609]: no field `o5` on type `uart1Resources<'_>` error[E0609]: no field `o5` on type `app::uart1Resources<'_>`
--> $DIR/resources-cfg.rs:77:21 --> $DIR/resources-cfg.rs:77:21
| |
77 | c.resources.o5; 77 | c.resources.o5;