From 0e717b897c4dc6e0d1f3efc5594c5a83745101d0 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 20 Feb 2024 20:21:11 +0000 Subject: [PATCH] Improve style Signed-off-by: Nick Spinale --- crates/sel4-kernel-loader/build.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/sel4-kernel-loader/build.rs b/crates/sel4-kernel-loader/build.rs index b58d5bcd9..e7123007f 100644 --- a/crates/sel4-kernel-loader/build.rs +++ b/crates/sel4-kernel-loader/build.rs @@ -20,7 +20,7 @@ use object::{ use quote::format_ident; use sel4_build_env::{get_libsel4_include_dirs, get_with_sel4_prefix_relative_fallback}; -use sel4_config::{sel4_cfg_if, sel4_cfg_str, sel4_cfg_usize}; +use sel4_config::{sel4_cfg, sel4_cfg_if, sel4_cfg_str, sel4_cfg_usize}; use sel4_kernel_loader_embed_page_tables::{ schemes, LeafLocation, Region, RegionsBuilder, Scheme, SchemeHelpers, }; @@ -29,13 +29,11 @@ use sel4_rustfmt_helper::Rustfmt; pub const SEL4_KERNEL_ENV: &str = "SEL4_KERNEL"; -sel4_cfg_if! { - if #[sel4_cfg(WORD_SIZE = "64")] { - type FileHeader = object::elf::FileHeader64; - } else if #[sel4_cfg(WORD_SIZE = "32")] { - type FileHeader = object::elf::FileHeader32; - } -} +#[sel4_cfg(WORD_SIZE = "64")] +type FileHeader = object::elf::FileHeader64; + +#[sel4_cfg(WORD_SIZE = "32")] +type FileHeader = object::elf::FileHeader32; sel4_cfg_if! { if #[sel4_cfg(SEL4_ARCH = "aarch64")] {