Merge pull request #536 from jannic/fix_clippy_warnings

Fix clippy warnings
rust-embedded · May 26, 2024 · f3f85e6 · f3f85e6
2 parents 4395bae + 8ab3799
commit f3f85e6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/cortex-m-rt/.cargo/config → cortex-m-rt/.cargo/config.toml b/cortex-m-rt/.cargo/config → cortex-m-rt/.cargo/config.toml
diff --git a/cortex-m-rt/build.rs b/cortex-m-rt/build.rs
@@ -42,6 +42,12 @@ INCLUDE device.x"#
         f
     };
 
+    println!("cargo:rustc-check-cfg=cfg(armv6m)");
+    println!("cargo:rustc-check-cfg=cfg(armv7m)");
+    println!("cargo:rustc-check-cfg=cfg(armv8m)");
+    println!("cargo:rustc-check-cfg=cfg(cortex_m)");
+    println!("cargo:rustc-check-cfg=cfg(has_fpu)");
+
     let max_int_handlers = if target.starts_with("thumbv6m-") {
         println!("cargo:rustc-cfg=cortex_m");
         println!("cargo:rustc-cfg=armv6m");

diff --git a/cortex-m-rt/examples/cfg-static.rs b/cortex-m-rt/examples/cfg-static.rs
@@ -4,6 +4,8 @@
 #![deny(warnings)]
 #![no_main]
 #![no_std]
+// This example uses an undefined cfg, `cfg(never)`
+#![allow(unexpected_cfgs)]
 
 extern crate cortex_m_rt as rt;
 extern crate panic_halt;

diff --git a/cortex-m-semihosting/build.rs b/cortex-m-semihosting/build.rs
@@ -3,6 +3,7 @@ use std::env;
 fn main() {
     let target = env::var("TARGET").unwrap();
 
+    println!("cargo:rustc-check-cfg=cfg(thumb)");
     if target.starts_with("thumbv") {
         println!("cargo:rustc-cfg=thumb");
     }

diff --git a/cortex-m/build.rs b/cortex-m/build.rs
@@ -4,6 +4,16 @@ fn main() {
     let target = env::var("TARGET").unwrap();
     let host_triple = env::var("HOST").unwrap();
 
+    println!("cargo:rustc-check-cfg=cfg(armv6m)");
+    println!("cargo:rustc-check-cfg=cfg(armv7em)");
+    println!("cargo:rustc-check-cfg=cfg(armv7m)");
+    println!("cargo:rustc-check-cfg=cfg(armv8m)");
+    println!("cargo:rustc-check-cfg=cfg(armv8m_base)");
+    println!("cargo:rustc-check-cfg=cfg(armv8m_main)");
+    println!("cargo:rustc-check-cfg=cfg(cortex_m)");
+    println!("cargo:rustc-check-cfg=cfg(has_fpu)");
+    println!("cargo:rustc-check-cfg=cfg(native)");
+
     if host_triple == target {
         println!("cargo:rustc-cfg=native");
     }