Fix Linter CI

.gitlab-ci.yml

@@ -21,8 +21,8 @@ build:
 fmt:
   stage: host
   script:
-      - rustup component add rustfmt-preview
+      - rustup component add rustfmt
-      - cargo fmt -- --check
+      - rustfmt --check
 
 unit_test:
   stage: test

rustfmt.toml

@@ -2,7 +2,8 @@ blank_lines_lower_bound = 0 # default
 blank_lines_upper_bound = 1 # default
 brace_style = "SameLineWhere" # default
 disable_all_formatting = false # default
-edition = "2021"
+edition = "2024"
+style_edition = "2015"
 empty_item_single_line = true # default
 fn_single_line = false # default
 force_explicit_abi = true # default

src/arch/x86_shared/device/ioapic.rs

@@ -309,7 +309,9 @@ pub unsafe fn handle_src_override(src_override: &'static MadtIntSrcOverride) {
 
 #[allow(dead_code)]
 pub unsafe fn init(active_table: &mut KernelMapper) {
-    let bsp_apic_id = ApicId::new(u32::from(cpuid().get_feature_info().unwrap().initial_local_apic_id())); // TODO: remove unwraps
+    let bsp_apic_id = ApicId::new(u32::from(
+        cpuid().get_feature_info().unwrap().initial_local_apic_id(),
+    )); // TODO: remove unwraps
 
     // search the madt for all IOAPICs.
     #[cfg(feature = "acpi")]

src/arch/x86_shared/device/local_apic.rs

@@ -96,7 +96,8 @@ impl LocalApic {
 
         PercpuBlock::current()
             .misc_arch_info
-            .apic_id_opt.set(Some(self.id()));
+            .apic_id_opt
+            .set(Some(self.id()));
     }
 
     unsafe fn read(&self, reg: u32) -> u32 {

src/arch/x86_shared/device/mod.rs

@@ -1,5 +1,5 @@
-use core::cell::Cell;
 use crate::memory::KernelMapper;
+use core::cell::Cell;
 
 pub mod cpu;
 #[cfg(feature = "acpi")]

src/context/context.rs

@@ -6,8 +6,7 @@ use core::{
     sync::atomic::{AtomicU32, Ordering},
 };
 use spin::RwLock;
-use syscall::UPPER_FDTBL_TAG;
+use syscall::{SigProcControl, Sigcontrol, UPPER_FDTBL_TAG};
-use syscall::{SigProcControl, Sigcontrol};
 
 #[cfg(feature = "sys_stat")]
 use crate::cpu_stats;

src/syscall/fs.rs

@@ -1,6 +1,5 @@
 //! Filesystem syscalls
-use core::mem::size_of;
+use core::{mem::size_of, num::NonZeroUsize};
-use core::num::NonZeroUsize;
 
 use alloc::{string::String, sync::Arc, vec::Vec};
 use redox_path::RedoxPath;

src/syscall/process.rs

@@ -14,9 +14,9 @@ use crate::{
     syscall::EventFlags,
 };
 
-use crate::context::context::FdTbl;
 use crate::{
     context,
+    context::context::FdTbl,
     paging::{Page, VirtualAddress, PAGE_SIZE},
     syscall::{error::*, flag::MapFlags},
     Bootstrap, CurrentRmmArch,