Merge pull request #2276 from hermit-os/cfg_select

refactor: migrate from `cfg_if` to `cfg_select`

Author: mkroening

Cargo.lock

@@ -319,7 +319,6 @@ async-trait = "0.1.89"
 bit_field = "0.10"
 bitflags = "2"
 build-time = "0.1.3"
-cfg-if = "1"
 crossbeam-utils = { version = "0.8", default-features = false }
 document-features = { version = "0.2", optional = true }
 embedded-io = { version = "0.7", features = ["alloc"] }

Cargo.toml

@@ -174,13 +174,14 @@ fn emit_func(func: ItemFn, sig: &ParsedSig, errno: bool) -> Result<ItemFn> {
 
 			#kernel_func
 
-			cfg_if::cfg_if! {
-				if #[cfg(all(
+			cfg_select! {
+				all(
 					feature = "kernel-stack",
 					not(any(target_arch = "riscv64", feature = "common-os")),
-				))] {
+				) => {
 					unsafe { crate::arch::kernel::kernel_stack::#kernel_function_ident(#(#args,)* #kernel_ident) }
-				} else {
+				}
+				_ => {
 					#unsafety { #kernel_ident(#(#args),*) }
 				}
 			}
@@ -254,13 +255,14 @@ mod tests {
 					ret
 				}
 
-				cfg_if::cfg_if! {
-					if #[cfg(all(
+				cfg_select! {
+					all(
 						feature = "kernel-stack",
 						not(any(target_arch = "riscv64", feature = "common-os")),
-					))] {
+					) => {
 						unsafe { crate::arch::kernel::kernel_stack::kernel_function2(a, b, _sys_test) }
-					} else {
+					}
+					_ => {
 						{ _sys_test(a, b) }
 					}
 				}
@@ -322,13 +324,14 @@ mod tests {
 					ret
 				}
 
-				cfg_if::cfg_if! {
-					if #[cfg(all(
+				cfg_select! {
+					all(
 						feature = "kernel-stack",
 						not(any(target_arch = "riscv64", feature = "common-os")),
-					))] {
+					) => {
 						unsafe { crate::arch::kernel::kernel_stack::kernel_function2(a, b, _sys_test) }
-					} else {
+					}
+					_ => {
 						unsafe { _sys_test(a, b) }
 					}
 				}
@@ -392,13 +395,14 @@ mod tests {
 					ret
 				}
 
-				cfg_if::cfg_if! {
-					if #[cfg(all(
+				cfg_select! {
+					all(
 						feature = "kernel-stack",
 						not(any(target_arch = "riscv64", feature = "common-os")),
-					))] {
+					) => {
 						unsafe { crate::arch::kernel::kernel_stack::kernel_function2(a, b, _sys_test) }
-					} else {
+					}
+					_ => {
 						{ _sys_test(a, b) }
 					}
 				}

hermit-macro/src/system.rs

@@ -209,10 +209,11 @@ pub fn halt() {
 pub fn shutdown(error_code: i32) -> ! {
 	info!("Shutting down system");
 
-	cfg_if::cfg_if! {
-		if #[cfg(feature = "semihosting")] {
+	cfg_select! {
+		feature = "semihosting" => {
 			semihosting::process::exit(error_code)
-		} else {
+		}
+		_ => {
 			unsafe {
 				const PSCI_SYSTEM_OFF: u64 = 0x8400_0008;
 				// call hypervisor to shut down the system

src/arch/aarch64/kernel/processor.rs

@@ -1,7 +1,7 @@
 //! Architecture-specific architecture abstraction.
 
-cfg_if::cfg_if! {
-	if #[cfg(target_arch = "aarch64")] {
+cfg_select! {
+	target_arch = "aarch64" => {
 		pub(crate) mod aarch64;
 		pub(crate) use self::aarch64::*;
 
@@ -22,7 +22,8 @@ cfg_if::cfg_if! {
 			get_processor_count,
 		};
 		pub use self::aarch64::mm::paging::{BasePageSize, PageSize};
-	} else if #[cfg(target_arch = "x86_64")] {
+	}
+	target_arch = "x86_64" => {
 		pub(crate) mod x86_64;
 		pub(crate) use self::x86_64::*;
 
@@ -51,7 +52,8 @@ cfg_if::cfg_if! {
 		pub use self::x86_64::mm::create_new_root_page_table;
 		#[cfg(feature = "common-os")]
 		pub use self::x86_64::kernel::{load_application, jump_to_user_land};
-	} else if #[cfg(target_arch = "riscv64")] {
+	}
+	target_arch = "riscv64" => {
 		pub(crate) mod riscv64;
 		pub(crate) use self::riscv64::*;
 

src/arch/mod.rs

@@ -229,10 +229,11 @@ pub fn halt() {
 pub fn shutdown(error_code: i32) -> ! {
 	info!("Shutting down system");
 
-	cfg_if::cfg_if! {
-		if #[cfg(feature = "semihosting")] {
+	cfg_select! {
+		feature = "semihosting" => {
 			semihosting::process::exit(error_code)
-		} else {
+		}
+		_ => {
 			// use SBI shutdown
 			match sbi_rt::system_reset(sbi_rt::Shutdown, sbi_rt::NoReason).into_result() {
 				Ok(_) => unreachable!("System reset shouldn't have returned with success."),

src/arch/riscv64/kernel/processor.rs

@@ -7,10 +7,11 @@
 
 #![allow(dead_code)]
 
-cfg_if::cfg_if! {
-	if #[cfg(feature = "pci")] {
+cfg_select! {
+	feature = "pci" => {
 		mod pci;
-	} else {
+	}
+	_ => {
 		mod mmio;
 	}
 }

src/drivers/console/mod.rs

@@ -5,10 +5,11 @@
 //!
 //! [File System Device]: https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-45800011
 
-cfg_if::cfg_if! {
-	if #[cfg(feature = "pci")] {
+cfg_select! {
+	feature = "pci" => {
 		mod pci;
-	} else {
+	}
+	_ => {
 		mod mmio;
 	}
 }

src/drivers/fs/mod.rs

@@ -57,24 +57,26 @@ pub(crate) fn mtu() -> u16 {
 	u16::from_str(&my_mtu).unwrap()
 }
 
-cfg_if::cfg_if! {
-	if #[cfg(all(
+cfg_select! {
+	all(
 		not(feature = "pci"),
 		any(
 			all(target_arch = "riscv64", feature = "gem-net"),
 			feature = "virtio-net",
 		),
-	))] {
+	) => {
 		pub(crate) use crate::arch::kernel::mmio::NetworkDevice;
-	} else if #[cfg(all(
+	}
+	all(
 		feature = "pci",
 		any(
 			feature = "rtl8139",
 			feature = "virtio-net",
 		),
-	))] {
+	) => {
 		pub(crate) use crate::drivers::pci::NetworkDevice;
-	} else {
+	}
+	_ => {
 		pub(crate) use loopback::NetworkDevice;
 	}
 }

src/drivers/net/mod.rs

@@ -5,10 +5,11 @@
 //!
 //! [Network Device]: https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-2170001
 
-cfg_if::cfg_if! {
-	if #[cfg(feature = "pci")] {
+cfg_select! {
+	feature = "pci" => {
 		mod pci;
-	} else {
+	}
+	_ => {
 		mod mmio;
 	}
 }