From 79b62797f549a71531bf5ede39cc6695871b7251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 22 Apr 2020 11:48:36 +0000 Subject: Update the test suite to use mod instead of const Changes MSRV to 1.42, failing tests updated to match 1.42. --- ui/single/locals-cfg.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/single/locals-cfg.rs') diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs index 54bba8a..5053cf3 100644 --- a/ui/single/locals-cfg.rs +++ b/ui/single/locals-cfg.rs @@ -1,7 +1,7 @@ #![no_main] #[rtic::app(device = lm3s6965)] -const APP: () = { +mod APP { #[init] fn init(_: init::Context) { #[cfg(never)] @@ -47,4 +47,4 @@ const APP: () = { extern "C" { fn UART1(); } -}; +} -- cgit v1.2.3 From 5cfd9b92384a6e2d352e35de9da1b7a2b53cc2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 19 May 2020 18:00:13 +0000 Subject: Modules using lower-case in examples --- ui/single/locals-cfg.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/single/locals-cfg.rs') diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs index 5053cf3..7ec46ac 100644 --- a/ui/single/locals-cfg.rs +++ b/ui/single/locals-cfg.rs @@ -1,7 +1,7 @@ #![no_main] #[rtic::app(device = lm3s6965)] -mod APP { +mod app { #[init] fn init(_: init::Context) { #[cfg(never)] -- cgit v1.2.3 From d7bd8c838a5c4e1ae6d28fa60e5e5969acbe1db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Mon, 8 Jun 2020 08:06:09 +0000 Subject: Import panic_halt so semihosting is not attempted ARMv6 would otherwise differ in output compared to ARMv7 --- ui/single/locals-cfg.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/single/locals-cfg.rs') diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs index 7ec46ac..e04e5b9 100644 --- a/ui/single/locals-cfg.rs +++ b/ui/single/locals-cfg.rs @@ -1,4 +1,5 @@ #![no_main] +use panic_halt as _; #[rtic::app(device = lm3s6965)] mod app { -- cgit v1.2.3 From 9d2598dc071882a94b813ab1d9ddf49092546257 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 1 Oct 2020 20:14:07 +0200 Subject: Fixing test errors --- ui/single/locals-cfg.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ui/single/locals-cfg.rs') diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs index 54bba8a..cd8677a 100644 --- a/ui/single/locals-cfg.rs +++ b/ui/single/locals-cfg.rs @@ -3,11 +3,13 @@ #[rtic::app(device = lm3s6965)] const APP: () = { #[init] - fn init(_: init::Context) { + fn init(_: init::Context) -> init::LateResources { #[cfg(never)] static mut FOO: u32 = 0; FOO; + + init::LateResources {} } #[idle] -- cgit v1.2.3