Some more warning cleanups

thepowersgang · Jun 28, 2024 · dd31d84 · dd31d84
1 parent 549065c
commit dd31d84
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/Kernel/Cargo.toml b/Kernel/Cargo.toml
@@ -39,7 +39,7 @@ usb-msc = { path = "Modules/usb_msc" }
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 #video-vga = { path = "Modules/video_vga" }
 
-[build_dependencies]
+[build-dependencies]
 my_dependencies = { git = "https://github.com/thepowersgang/my-dependencies-rs.git" }
 
 # Workspace members for the tests (so they work within VSCode)

diff --git a/Kernel/tests/filesystem/Cargo.toml b/Kernel/tests/filesystem/Cargo.toml
@@ -19,5 +19,5 @@ fs_fat = { path = "../../Modules/fs_fat" }
 fs_iso9660 = { path = "../../Modules/fs_iso9660" }
 fs_ntfs = { path = "../../Modules/fs_ntfs" }
 
-[build_dependencies]
+[build-dependencies]
 my_dependencies = { git = "https://github.com/thepowersgang/my-dependencies-rs.git" }
diff --git a/Usermode/libstd/Cargo.toml b/Usermode/libstd/Cargo.toml
@@ -12,3 +12,6 @@ macros = { path = "../libmacros" }
 alloc_system = { path = "../liballoc_system" }
 
 loader = { path = "../loader/lib" }
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(arch, values("native"))'] }
diff --git a/Usermode/libstd_rt/Cargo.toml b/Usermode/libstd_rt/Cargo.toml
@@ -10,3 +10,6 @@ path = "lib.rs"
 syscalls = { path = "../libsyscalls" }
 macros = { path = "../libmacros" }
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(arch, values("native"))'] }
+
diff --git a/Usermode/libstd_rt/lib.rs b/Usermode/libstd_rt/lib.rs
@@ -65,15 +65,7 @@ pub fn rust_begin_unwind(info: &::core::panic::PanicInfo) -> ! {
 		Some(v) => (v.file(), v.line()),
 		None => ("", 0),
 		};
-	if let Some(m) = info.payload().downcast_ref::<::core::fmt::Arguments>() {
-		begin_panic_fmt(m, file_line)
-	}
-	else if let Some(m) = info.payload().downcast_ref::<&str>() {
-		begin_panic_fmt(&m, file_line)
-	}
-	else {
-		begin_panic_fmt(&info.message(), file_line)
-	}
+	begin_panic_fmt(&info.message(), file_line)
 }
 #[lang="eh_personality"]
 #[cfg(not(test))]

diff --git a/Usermode/libsyscalls/Cargo.toml b/Usermode/libsyscalls/Cargo.toml
@@ -8,3 +8,6 @@ path = "lib.rs"
 
 [features]
 native_nolink = []
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(arch, values("native"))'] }
diff --git a/Usermode/loader/bin/Cargo.toml b/Usermode/loader/bin/Cargo.toml
@@ -20,3 +20,6 @@ cmdline_words_parser = { path = "../../../externals/crates.io/cmdline_words_pars
 std = { path = "../../libstd" }
 syscalls = { path = "../../libsyscalls" }
 loader = { path = "../lib" }
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(arch, values("native"))'] }