From 5f61f7b75fa049af0f21576232c3d45022a8af77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Wed, 10 Jun 2020 12:07:23 +0000
Subject: Use cargo feature instead of conditional compilation hacks

---
 examples/t-cfg-resources.rs | 52 +++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

(limited to 'examples')

diff --git a/examples/t-cfg-resources.rs b/examples/t-cfg-resources.rs
index 63c4124..a8efe79 100644
--- a/examples/t-cfg-resources.rs
+++ b/examples/t-cfg-resources.rs
@@ -5,36 +5,32 @@
 
 use panic_halt as _;
 
-#[cfg(rustc_is_nightly)]
-mod example {
+#[rtfm::app(device = lm3s6965)]
+const APP: () = {
+    struct Resources {
+        // A resource
+        #[init(0)]
+        shared: u32,
 
-    #[rtfm::app(device = lm3s6965)]
-    const APP: () = {
-        struct Resources {
-            // A resource
-            #[init(0)]
-            shared: u32,
+        // A conditionally compiled resource behind feature_x
+        #[cfg(feature = "feature_x")]
+        x: u32,
 
-            // A conditionally compiled resource behind feature_x
-            #[cfg(feature = "feature_x")]
-            x: u32,
-
-            dummy: (),
-        }
+        dummy: (),
+    }
 
-        #[init]
-        fn init(_: init::Context) -> init::LateResources {
-            init::LateResources {
-                // The feature needs to be applied everywhere x is defined or used
-                #[cfg(feature = "feature_x")]
-                x: 0,
-                dummy: (), // dummy such that we have at least one late resource
-            }
+    #[init]
+    fn init(_: init::Context) -> init::LateResources {
+        init::LateResources {
+            // The feature needs to be applied everywhere x is defined or used
+            #[cfg(feature = "feature_x")]
+            x: 0,
+            dummy: (), // dummy such that we have at least one late resource
         }
+    }
 
-        #[idle]
-        fn idle(_cx: idle::Context) -> ! {
-            loop {}
-        }
-    };
-}
+    #[idle]
+    fn idle(_cx: idle::Context) -> ! {
+        loop {}
+    }
+};
-- 
cgit v1.2.3