aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/single/exception-invalid.rs4
-rw-r--r--ui/single/exception-systick-used.rs4
-rw-r--r--ui/single/extern-interrupt-not-enough.rs4
-rw-r--r--ui/single/extern-interrupt-used.rs4
-rw-r--r--ui/single/locals-cfg.rs5
-rw-r--r--ui/single/locals-cfg.stderr30
-rw-r--r--ui/single/resources-cfg.rs6
-rw-r--r--ui/single/resources-cfg.stderr66
-rw-r--r--ui/single/task-priority-too-high.rs6
-rw-r--r--ui/single/task-priority-too-high.stderr16
10 files changed, 75 insertions, 70 deletions
diff --git a/ui/single/exception-invalid.rs b/ui/single/exception-invalid.rs
index efe06212..04d9bc75 100644
--- a/ui/single/exception-invalid.rs
+++ b/ui/single/exception-invalid.rs
@@ -1,7 +1,7 @@
#![no_main]
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
#[task(binds = NonMaskableInt)]
fn nmi(_: nmi::Context) {}
-};
+}
diff --git a/ui/single/exception-systick-used.rs b/ui/single/exception-systick-used.rs
index 36ed1744..1c30b700 100644
--- a/ui/single/exception-systick-used.rs
+++ b/ui/single/exception-systick-used.rs
@@ -1,10 +1,10 @@
#![no_main]
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
#[task(binds = SysTick)]
fn sys_tick(_: sys_tick::Context) {}
#[task(schedule = [foo])]
fn foo(_: foo::Context) {}
-};
+}
diff --git a/ui/single/extern-interrupt-not-enough.rs b/ui/single/extern-interrupt-not-enough.rs
index 53820b52..f2624036 100644
--- a/ui/single/extern-interrupt-not-enough.rs
+++ b/ui/single/extern-interrupt-not-enough.rs
@@ -1,7 +1,7 @@
#![no_main]
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
#[task]
fn a(_: a::Context) {}
-};
+}
diff --git a/ui/single/extern-interrupt-used.rs b/ui/single/extern-interrupt-used.rs
index 82f1bdd2..89c23784 100644
--- a/ui/single/extern-interrupt-used.rs
+++ b/ui/single/extern-interrupt-used.rs
@@ -1,11 +1,11 @@
#![no_main]
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
#[task(binds = UART0)]
fn a(_: a::Context) {}
extern "C" {
fn UART0();
}
-};
+}
diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs
index 54bba8ae..e04e5b93 100644
--- a/ui/single/locals-cfg.rs
+++ b/ui/single/locals-cfg.rs
@@ -1,7 +1,8 @@
#![no_main]
+use panic_halt as _;
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
#[init]
fn init(_: init::Context) {
#[cfg(never)]
@@ -47,4 +48,4 @@ const APP: () = {
extern "C" {
fn UART1();
}
-};
+}
diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr
index 49695cbf..1b46cea7 100644
--- a/ui/single/locals-cfg.stderr
+++ b/ui/single/locals-cfg.stderr
@@ -1,37 +1,41 @@
error[E0425]: cannot find value `FOO` in this scope
- --> $DIR/locals-cfg.rs:10:9
+ --> $DIR/locals-cfg.rs:11:9
|
-10 | FOO;
+11 | FOO;
| ^^^ not found in this scope
error[E0425]: cannot find value `FOO` in this scope
- --> $DIR/locals-cfg.rs:18:9
+ --> $DIR/locals-cfg.rs:19:9
|
-18 | FOO;
+19 | FOO;
| ^^^ not found in this scope
error[E0425]: cannot find value `FOO` in this scope
- --> $DIR/locals-cfg.rs:28:9
+ --> $DIR/locals-cfg.rs:29:9
|
-28 | FOO;
+29 | FOO;
| ^^^ not found in this scope
error[E0425]: cannot find value `FOO` in this scope
- --> $DIR/locals-cfg.rs:36:9
+ --> $DIR/locals-cfg.rs:37:9
|
-36 | FOO;
+37 | FOO;
| ^^^ not found in this scope
error[E0425]: cannot find value `FOO` in this scope
- --> $DIR/locals-cfg.rs:44:9
+ --> $DIR/locals-cfg.rs:45:9
|
-44 | FOO;
+45 | FOO;
| ^^^ not found in this scope
-error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
+error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`.
|
- = note: first defined in crate `std`.
+ = 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-cf0f33af3a901778.rlib
+ = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-ba6f0ab3439cbc7e.rmeta
error: duplicate lang item in crate `panic_halt`: `panic_impl`.
|
- = note: first defined in crate `panic_semihosting`.
+ = note: the lang item is first defined in crate `panic_halt` (which `$CRATE` depends on)
+ = note: first definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-ba6f0ab3439cbc7e.rmeta
+ = note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_semihosting-805015f4a2d05965.rmeta \ No newline at end of file
diff --git a/ui/single/resources-cfg.rs b/ui/single/resources-cfg.rs
index df7ac806..f2569e92 100644
--- a/ui/single/resources-cfg.rs
+++ b/ui/single/resources-cfg.rs
@@ -1,7 +1,9 @@
#![no_main]
+use panic_halt as _;
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+ #[resources]
struct Resources {
#[cfg(never)]
#[init(0)]
@@ -72,4 +74,4 @@ const APP: () = {
c.resources.s2;
c.resources.o5;
}
-};
+}
diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr
index c47b95d4..9c39e567 100644
--- a/ui/single/resources-cfg.stderr
+++ b/ui/single/resources-cfg.stderr
@@ -1,119 +1,125 @@
+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-cf0f33af3a901778.rlib
+ = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-ba6f0ab3439cbc7e.rmeta
+
error[E0609]: no field `o1` on type `initResources<'_>`
- --> $DIR/resources-cfg.rs:45:21
+ --> $DIR/resources-cfg.rs:47:21
|
-45 | c.resources.o1;
+47 | c.resources.o1;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o4` on type `initResources<'_>`
- --> $DIR/resources-cfg.rs:46:21
+ --> $DIR/resources-cfg.rs:48:21
|
-46 | c.resources.o4;
+48 | c.resources.o4;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o5` on type `initResources<'_>`
- --> $DIR/resources-cfg.rs:47:21
+ --> $DIR/resources-cfg.rs:49:21
|
-47 | c.resources.o5;
+49 | c.resources.o5;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o6` on type `initResources<'_>`
- --> $DIR/resources-cfg.rs:48:21
+ --> $DIR/resources-cfg.rs:50:21
|
-48 | c.resources.o6;
+50 | c.resources.o6;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s3` on type `initResources<'_>`
- --> $DIR/resources-cfg.rs:49:21
+ --> $DIR/resources-cfg.rs:51:21
|
-49 | c.resources.s3;
+51 | c.resources.s3;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o2` on type `idleResources<'_>`
- --> $DIR/resources-cfg.rs:54:21
+ --> $DIR/resources-cfg.rs:56:21
|
-54 | c.resources.o2;
+56 | c.resources.o2;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o4` on type `idleResources<'_>`
- --> $DIR/resources-cfg.rs:55:21
+ --> $DIR/resources-cfg.rs:57:21
|
-55 | c.resources.o4;
+57 | c.resources.o4;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s1` on type `idleResources<'_>`
- --> $DIR/resources-cfg.rs:56:21
+ --> $DIR/resources-cfg.rs:58:21
|
-56 | c.resources.s1;
+58 | c.resources.s1;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s3` on type `idleResources<'_>`
- --> $DIR/resources-cfg.rs:57:21
+ --> $DIR/resources-cfg.rs:59:21
|
-57 | c.resources.s3;
+59 | c.resources.s3;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o3` on type `uart0Resources<'_>`
- --> $DIR/resources-cfg.rs:64:21
+ --> $DIR/resources-cfg.rs:66:21
|
-64 | c.resources.o3;
+66 | c.resources.o3;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s1` on type `uart0Resources<'_>`
- --> $DIR/resources-cfg.rs:65:21
+ --> $DIR/resources-cfg.rs:67:21
|
-65 | c.resources.s1;
+67 | c.resources.s1;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s2` on type `uart0Resources<'_>`
- --> $DIR/resources-cfg.rs:66:21
+ --> $DIR/resources-cfg.rs:68:21
|
-66 | c.resources.s2;
+68 | c.resources.s2;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s3` on type `uart0Resources<'_>`
- --> $DIR/resources-cfg.rs:67:21
+ --> $DIR/resources-cfg.rs:69:21
|
-67 | c.resources.s3;
+69 | c.resources.s3;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `s2` on type `uart1Resources<'_>`
- --> $DIR/resources-cfg.rs:72:21
+ --> $DIR/resources-cfg.rs:74:21
|
-72 | c.resources.s2;
+74 | c.resources.s2;
| ^^ unknown field
|
= note: available fields are: `__marker__`
error[E0609]: no field `o5` on type `uart1Resources<'_>`
- --> $DIR/resources-cfg.rs:73:21
+ --> $DIR/resources-cfg.rs:75:21
|
-73 | c.resources.o5;
+75 | c.resources.o5;
| ^^ unknown field
|
= note: available fields are: `__marker__`
diff --git a/ui/single/task-priority-too-high.rs b/ui/single/task-priority-too-high.rs
index 539c3f5d..fbafa4d2 100644
--- a/ui/single/task-priority-too-high.rs
+++ b/ui/single/task-priority-too-high.rs
@@ -1,9 +1,7 @@
#![no_main]
-use rtic::app;
-
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
#[init]
fn init(_: init::Context) {}
@@ -35,4 +33,4 @@ const APP: () = {
// this value is too high!
#[task(binds = I2C0, priority = 9)]
fn i2c0(_: i2c0::Context) {}
-};
+}
diff --git a/ui/single/task-priority-too-high.stderr b/ui/single/task-priority-too-high.stderr
index eae6074d..e84ddd3c 100644
--- a/ui/single/task-priority-too-high.stderr
+++ b/ui/single/task-priority-too-high.stderr
@@ -1,13 +1,7 @@
-warning: unused import: `rtic::app`
- --> $DIR/task-priority-too-high.rs:3:5
- |
-3 | use rtic::app;
- | ^^^^^^^^^
- |
- = note: #[warn(unused_imports)] on by default
-
error[E0080]: evaluation of constant value failed
- --> $DIR/task-priority-too-high.rs:5:1
+ --> $DIR/task-priority-too-high.rs:3:1
+ |
+3 | #[rtic::app(device = lm3s6965)]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `8_usize - 9_usize` which would overflow
|
-5 | #[rtic::app(device = lm3s6965)]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+ = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-30 20:11:12 +0000