diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/exception-invalid.rs (renamed from ui/single/exception-invalid.rs) | 0 | ||||
-rw-r--r-- | ui/exception-invalid.stderr (renamed from ui/single/exception-invalid.stderr) | 0 | ||||
-rw-r--r-- | ui/extern-interrupt-not-enough.rs (renamed from ui/single/extern-interrupt-not-enough.rs) | 0 | ||||
-rw-r--r-- | ui/extern-interrupt-not-enough.stderr (renamed from ui/single/extern-interrupt-not-enough.stderr) | 0 | ||||
-rw-r--r-- | ui/extern-interrupt-used.rs (renamed from ui/single/extern-interrupt-used.rs) | 0 | ||||
-rw-r--r-- | ui/extern-interrupt-used.stderr (renamed from ui/single/extern-interrupt-used.stderr) | 0 | ||||
-rw-r--r-- | ui/local-cfg-task-local-err.rs (renamed from ui/single/local-cfg-task-local-err.rs) | 17 | ||||
-rw-r--r-- | ui/local-cfg-task-local-err.stderr (renamed from ui/single/local-cfg-task-local-err.stderr) | 8 | ||||
-rw-r--r-- | ui/local-err.rs (renamed from ui/single/local-err.rs) | 4 | ||||
-rw-r--r-- | ui/local-err.stderr (renamed from ui/single/local-err.stderr) | 0 | ||||
-rw-r--r-- | ui/locals-cfg.rs (renamed from ui/single/locals-cfg.rs) | 7 | ||||
-rw-r--r-- | ui/locals-cfg.stderr | 29 | ||||
-rw-r--r-- | ui/resources-cfg.rs (renamed from ui/single/resources-cfg.rs) | 7 | ||||
-rw-r--r-- | ui/resources-cfg.stderr | 119 | ||||
-rw-r--r-- | ui/single/exception-systick-used.rs | 7 | ||||
-rw-r--r-- | ui/single/exception-systick-used.stderr | 5 | ||||
-rw-r--r-- | ui/single/locals-cfg.stderr | 35 | ||||
-rw-r--r-- | ui/single/resources-cfg.stderr | 125 | ||||
-rw-r--r-- | ui/task-priority-too-high.rs (renamed from ui/single/task-priority-too-high.rs) | 4 | ||||
-rw-r--r-- | ui/task-priority-too-high.stderr (renamed from ui/single/task-priority-too-high.stderr) | 0 |
20 files changed, 174 insertions, 193 deletions
diff --git a/ui/single/exception-invalid.rs b/ui/exception-invalid.rs index 04d9bc75..04d9bc75 100644 --- a/ui/single/exception-invalid.rs +++ b/ui/exception-invalid.rs diff --git a/ui/single/exception-invalid.stderr b/ui/exception-invalid.stderr index 90213768..90213768 100644 --- a/ui/single/exception-invalid.stderr +++ b/ui/exception-invalid.stderr diff --git a/ui/single/extern-interrupt-not-enough.rs b/ui/extern-interrupt-not-enough.rs index f2624036..f2624036 100644 --- a/ui/single/extern-interrupt-not-enough.rs +++ b/ui/extern-interrupt-not-enough.rs diff --git a/ui/single/extern-interrupt-not-enough.stderr b/ui/extern-interrupt-not-enough.stderr index 14f8fe9c..14f8fe9c 100644 --- a/ui/single/extern-interrupt-not-enough.stderr +++ b/ui/extern-interrupt-not-enough.stderr diff --git a/ui/single/extern-interrupt-used.rs b/ui/extern-interrupt-used.rs index 240e7363..240e7363 100644 --- a/ui/single/extern-interrupt-used.rs +++ b/ui/extern-interrupt-used.rs diff --git a/ui/single/extern-interrupt-used.stderr b/ui/extern-interrupt-used.stderr index b4d8d160..b4d8d160 100644 --- a/ui/single/extern-interrupt-used.stderr +++ b/ui/extern-interrupt-used.stderr diff --git a/ui/single/local-cfg-task-local-err.rs b/ui/local-cfg-task-local-err.rs index 412f6142..d4752edf 100644 --- a/ui/single/local-cfg-task-local-err.rs +++ b/ui/local-cfg-task-local-err.rs @@ -26,15 +26,18 @@ mod app { } #[init] - fn init(_: init::Context) -> init::LateResources { + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART1); - init::LateResources { - #[cfg(feature = "feature_l2")] - l2: 2, - #[cfg(not(feature = "feature_l2"))] - l2: 5, - } + ( + init::LateResources { + #[cfg(feature = "feature_l2")] + l2: 2, + #[cfg(not(feature = "feature_l2"))] + l2: 5, + }, + init::Monotonics(), + ) } // l1 ok (task_local) diff --git a/ui/single/local-cfg-task-local-err.stderr b/ui/local-cfg-task-local-err.stderr index 9a84ead4..73dfaeb6 100644 --- a/ui/single/local-cfg-task-local-err.stderr +++ b/ui/local-cfg-task-local-err.stderr @@ -5,15 +5,15 @@ error: task local resource "l2" is used by multiple tasks | ^^ error: task local resource "l2" is used by task "uart0" with priority 1 - --> $DIR/local-cfg-task-local-err.rs:51:39 + --> $DIR/local-cfg-task-local-err.rs:54:39 | -51 | #[cfg(feature = "feature_l2")]l2, +54 | #[cfg(feature = "feature_l2")]l2, | ^^ error: task local resource "l2" is used by task "uart1" with priority 1 - --> $DIR/local-cfg-task-local-err.rs:60:44 + --> $DIR/local-cfg-task-local-err.rs:63:44 | -60 | #[cfg(not(feature = "feature_l2"))]l2 +63 | #[cfg(not(feature = "feature_l2"))]l2 | ^^ warning: unused import: `cortex_m_semihosting::debug` diff --git a/ui/single/local-err.rs b/ui/local-err.rs index 0fe98a4b..7ebfc069 100644 --- a/ui/single/local-err.rs +++ b/ui/local-err.rs @@ -39,10 +39,10 @@ mod app { } #[init] - fn init(_: init::Context) -> init::LateResources { + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART1); - init::LateResources { e2: 2, l2: 2 } + (init::LateResources { e2: 2, l2: 2 }, init::Monotonics()) } // `shared` cannot be accessed from this context diff --git a/ui/single/local-err.stderr b/ui/local-err.stderr index 88369d8e..88369d8e 100644 --- a/ui/single/local-err.stderr +++ b/ui/local-err.stderr diff --git a/ui/single/locals-cfg.rs b/ui/locals-cfg.rs index 3bfdaa1e..170d3026 100644 --- a/ui/single/locals-cfg.rs +++ b/ui/locals-cfg.rs @@ -1,16 +1,17 @@ #![no_main] -use panic_halt as _; + +use panic_semihosting as _; #[rtic::app(device = lm3s6965, dispatchers = [SSI0])] mod app { #[init] - fn init(_: init::Context) -> init::LateResources { + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { #[cfg(never)] static mut FOO: u32 = 0; FOO; - init::LateResources {} + (init::LateResources {}, init::Monotonics()) } #[idle] diff --git a/ui/locals-cfg.stderr b/ui/locals-cfg.stderr new file mode 100644 index 00000000..33a80754 --- /dev/null +++ b/ui/locals-cfg.stderr @@ -0,0 +1,29 @@ +error[E0425]: cannot find value `FOO` in this scope + --> $DIR/locals-cfg.rs:12:9 + | +12 | FOO; + | ^^^ not found in this scope + +error[E0425]: cannot find value `FOO` in this scope + --> $DIR/locals-cfg.rs:22:9 + | +22 | FOO; + | ^^^ not found in this scope + +error[E0425]: cannot find value `FOO` in this scope + --> $DIR/locals-cfg.rs:32:9 + | +32 | FOO; + | ^^^ not found in this scope + +error[E0425]: cannot find value `FOO` in this scope + --> $DIR/locals-cfg.rs:40:9 + | +40 | FOO; + | ^^^ not found in this scope + +error[E0425]: cannot find value `FOO` in this scope + --> $DIR/locals-cfg.rs:48:9 + | +48 | FOO; + | ^^^ not found in this scope diff --git a/ui/single/resources-cfg.rs b/ui/resources-cfg.rs index 2ba65a04..c802a46f 100644 --- a/ui/single/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 { @@ -43,14 +44,14 @@ mod app { } #[init(resources = [o1, o4, o5, o6, s3])] - fn init(c: init::Context) -> init::LateResources { + fn init(c: init::Context) -> (init::LateResources, init::Monotonics) { c.resources.o1; c.resources.o4; c.resources.o5; c.resources.o6; c.resources.s3; - init::LateResources {} + (init::LateResources {}, init::Monotonics()) } #[idle(resources = [o2, &o4, s1, &s3])] diff --git a/ui/resources-cfg.stderr b/ui/resources-cfg.stderr new file mode 100644 index 00000000..03612de0 --- /dev/null +++ b/ui/resources-cfg.stderr @@ -0,0 +1,119 @@ +error[E0609]: no field `o1` on type `__rtic_internal_initResources<'_>` + --> $DIR/resources-cfg.rs:48:21 + | +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:49:21 + | +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:50:21 + | +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:51:21 + | +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:52:21 + | +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:59:21 + | +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:60:21 + | +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:61:21 + | +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:62:21 + | +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:69:21 + | +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:70:21 + | +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:71:21 + | +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:72:21 + | +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:77:21 + | +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:78:21 + | +78 | c.resources.o5; + | ^^ unknown field + | + = note: available fields are: `__marker__` diff --git a/ui/single/exception-systick-used.rs b/ui/single/exception-systick-used.rs deleted file mode 100644 index 9e94c739..00000000 --- a/ui/single/exception-systick-used.rs +++ /dev/null @@ -1,7 +0,0 @@ -#![no_main] - -#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] -mod app { - #[task(binds = SysTick)] - fn sys_tick(_: sys_tick::Context) {} -} diff --git a/ui/single/exception-systick-used.stderr b/ui/single/exception-systick-used.stderr deleted file mode 100644 index 23b6dc4a..00000000 --- a/ui/single/exception-systick-used.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: this exception can't be used because it's being used by the runtime - --> $DIR/exception-systick-used.rs:6:8 - | -6 | fn sys_tick(_: sys_tick::Context) {} - | ^^^^^^^^ diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr deleted file mode 100644 index 47992b3e..00000000 --- a/ui/single/locals-cfg.stderr +++ /dev/null @@ -1,35 +0,0 @@ -error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:11:9 - | -11 | FOO; - | ^^^ not found in this scope - -error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:21:9 - | -21 | FOO; - | ^^^ not found in this scope - -error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:31:9 - | -31 | FOO; - | ^^^ not found in this scope - -error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:39:9 - | -39 | FOO; - | ^^^ not found in this scope - -error[E0425]: cannot find value `FOO` in this scope - --> $DIR/locals-cfg.rs:47:9 - | -47 | 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-e12de7683a34c500.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr deleted file mode 100644 index 39f2c1aa..00000000 --- a/ui/single/resources-cfg.stderr +++ /dev/null @@ -1,125 +0,0 @@ -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-e12de7683a34c500.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta - -error[E0609]: no field `o1` on type `initResources<'_>` - --> $DIR/resources-cfg.rs:47:21 - | -47 | c.resources.o1; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o4` on type `initResources<'_>` - --> $DIR/resources-cfg.rs:48:21 - | -48 | c.resources.o4; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o5` on type `initResources<'_>` - --> $DIR/resources-cfg.rs:49:21 - | -49 | c.resources.o5; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o6` on type `initResources<'_>` - --> $DIR/resources-cfg.rs:50:21 - | -50 | c.resources.o6; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s3` on type `initResources<'_>` - --> $DIR/resources-cfg.rs:51:21 - | -51 | c.resources.s3; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o2` on type `idleResources<'_>` - --> $DIR/resources-cfg.rs:58:21 - | -58 | c.resources.o2; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o4` on type `idleResources<'_>` - --> $DIR/resources-cfg.rs:59:21 - | -59 | c.resources.o4; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s1` on type `idleResources<'_>` - --> $DIR/resources-cfg.rs:60:21 - | -60 | c.resources.s1; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s3` on type `idleResources<'_>` - --> $DIR/resources-cfg.rs:61:21 - | -61 | c.resources.s3; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o3` on type `uart0Resources<'_>` - --> $DIR/resources-cfg.rs:68:21 - | -68 | c.resources.o3; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s1` on type `uart0Resources<'_>` - --> $DIR/resources-cfg.rs:69:21 - | -69 | c.resources.s1; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s2` on type `uart0Resources<'_>` - --> $DIR/resources-cfg.rs:70:21 - | -70 | c.resources.s2; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s3` on type `uart0Resources<'_>` - --> $DIR/resources-cfg.rs:71:21 - | -71 | c.resources.s3; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `s2` on type `uart1Resources<'_>` - --> $DIR/resources-cfg.rs:76:21 - | -76 | c.resources.s2; - | ^^ unknown field - | - = note: available fields are: `__marker__` - -error[E0609]: no field `o5` on type `uart1Resources<'_>` - --> $DIR/resources-cfg.rs:77:21 - | -77 | c.resources.o5; - | ^^ unknown field - | - = note: available fields are: `__marker__` diff --git a/ui/single/task-priority-too-high.rs b/ui/task-priority-too-high.rs index caa7b8ee..b1cbfa94 100644 --- a/ui/single/task-priority-too-high.rs +++ b/ui/task-priority-too-high.rs @@ -3,8 +3,8 @@ #[rtic::app(device = lm3s6965)] mod app { #[init] - fn init(_: init::Context) -> init::LateResources { - init::LateResources {} + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { + (init::LateResources {}, init::Monotonics()) } #[task(binds = GPIOA, priority = 1)] diff --git a/ui/single/task-priority-too-high.stderr b/ui/task-priority-too-high.stderr index 984d3fac..984d3fac 100644 --- a/ui/single/task-priority-too-high.stderr +++ b/ui/task-priority-too-high.stderr |