From 1ff46c8482627eb93e5ed4788b9b604aedb87e07 Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Mon, 4 Aug 2025 12:34:31 +0000
Subject: [PATCH] Fix Linter CI

---
 .gitlab-ci.yml                           | 4 ++--
 rustfmt.toml                             | 3 ++-
 src/arch/x86_shared/device/ioapic.rs     | 4 +++-
 src/arch/x86_shared/device/local_apic.rs | 3 ++-
 src/arch/x86_shared/device/mod.rs        | 2 +-
 src/context/context.rs                   | 3 +--
 src/syscall/fs.rs                        | 3 +--
 src/syscall/process.rs                   | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3efafbe..ae2262c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,8 @@ build:
 fmt:
   stage: host
   script:
-      - rustup component add rustfmt-preview
-      - cargo fmt -- --check
+      - rustup component add rustfmt
+      - rustfmt --check
 
 unit_test:
   stage: test
diff --git a/rustfmt.toml b/rustfmt.toml
index becbe9e6..5dc46d08 100644
--- a/rustfmt.toml
+++ b/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
diff --git a/src/arch/x86_shared/device/ioapic.rs b/src/arch/x86_shared/device/ioapic.rs
index 958f53e5..9fcce6d7 100644
--- a/src/arch/x86_shared/device/ioapic.rs
+++ b/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")]
diff --git a/src/arch/x86_shared/device/local_apic.rs b/src/arch/x86_shared/device/local_apic.rs
index cc78b570..14b10bd9 100644
--- a/src/arch/x86_shared/device/local_apic.rs
+++ b/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 {
diff --git a/src/arch/x86_shared/device/mod.rs b/src/arch/x86_shared/device/mod.rs
index 8a7c6275..0688dbd5 100644
--- a/src/arch/x86_shared/device/mod.rs
+++ b/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")]
diff --git a/src/context/context.rs b/src/context/context.rs
index a3126b4b..89ed81f4 100644
--- a/src/context/context.rs
+++ b/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};
+use syscall::{SigProcControl, Sigcontrol, UPPER_FDTBL_TAG};
 
 #[cfg(feature = "sys_stat")]
 use crate::cpu_stats;
diff --git a/src/syscall/fs.rs b/src/syscall/fs.rs
index 0f9c4871..2a54875c 100644
--- a/src/syscall/fs.rs
+++ b/src/syscall/fs.rs
@@ -1,6 +1,5 @@
 //! Filesystem syscalls
-use core::mem::size_of;
-use core::num::NonZeroUsize;
+use core::{mem::size_of, num::NonZeroUsize};
 
 use alloc::{string::String, sync::Arc, vec::Vec};
 use redox_path::RedoxPath;
diff --git a/src/syscall/process.rs b/src/syscall/process.rs
index 0f39de08..62460ce2 100644
--- a/src/syscall/process.rs
+++ b/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,