style: add rustfmt.toml, simplify ci

Author: AsakuraMizu

.github/workflows/ci.yml

@@ -1,32 +1,45 @@
 name: CI
 
+on: [push, pull_request]
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-on: [push, pull_request]
 
 jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+      - name: Format code
+        run: cargo fmt --all --check
+
   check:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        targets: [x86_64-unknown-linux-gnu, x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat]
+        target:
+          - x86_64-unknown-linux-gnu
+          - x86_64-unknown-none
+          - riscv64gc-unknown-none-elf
+          - aarch64-unknown-none-softfloat
+          - loongarch64-unknown-none-softfloat
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
-            components: rust-src, clippy, rustfmt
-            targets: ${{ matrix.targets }}
-      - name: Check rust version
-        run: rustc --version --verbose
-      - name: Check code format
-        run: cargo fmt --all -- --check
+          components: rust-src, clippy, rustfmt
+          targets: ${{ matrix.target }}
       - name: Clippy
-        run: cargo clippy --target ${{ matrix.targets }} --all-features
+        run: cargo clippy --target ${{ matrix.target }} --all-features
       - name: Unit test
-        if: ${{ matrix.targets == 'x86_64-unknown-linux-gnu' }}
-        run: cargo test --target ${{ matrix.targets }} -- --nocapture
+        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
+        run: cargo test --target ${{ matrix.target }} -- --nocapture
+
   doc:
     runs-on: ubuntu-latest
     steps:
@@ -40,6 +53,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           path: target/doc
+
   deploy:
     runs-on: ubuntu-latest
     needs: doc
@@ -54,4 +68,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4

rustfmt.toml

@@ -0,0 +1,17 @@
+unstable_features = true
+
+style_edition = "2024"
+
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
+
+normalize_comments = true
+
+reorder_impl_items = true
+condense_wildcard_suffixes = true
+enum_discrim_align_threshold = 20
+use_field_init_shorthand = true
+
+format_strings = true
+format_code_in_doc_comments = true
+format_macro_matchers = true

src/action.rs

@@ -15,16 +15,12 @@ use crate::SignalSet;
 pub enum DefaultSignalAction {
     /// Terminate the process.
     Terminate,
-
     /// Ignore the signal.
     Ignore,
-
     /// Terminate the process and generate a core dump.
     CoreDump,
-
     /// Stop the process.
     Stop,
-
     /// Continue the process if stopped.
     Continue,
 }

src/api/process.rs

@@ -1,13 +1,13 @@
+use alloc::{
+    sync::{Arc, Weak},
+    vec::Vec,
+};
 use core::{
     array,
     ops::{Index, IndexMut},
     sync::atomic::{AtomicBool, Ordering},
 };
 
-use alloc::{
-    sync::{Arc, Weak},
-    vec::Vec,
-};
 use kspin::SpinNoIrq;
 
 use crate::{
@@ -27,6 +27,7 @@ impl Default for SignalActions {
 
 impl Index<Signo> for SignalActions {
     type Output = SignalAction;
+
     fn index(&self, signo: Signo) -> &SignalAction {
         &self.0[signo as usize - 1]
     }

src/api/thread.rs

@@ -1,21 +1,20 @@
+use alloc::sync::Arc;
 use core::{
     alloc::Layout,
     mem::offset_of,
     sync::atomic::{AtomicBool, Ordering},
 };
 
-use alloc::sync::Arc;
 use axcpu::uspace::UserContext;
 use kspin::SpinNoIrq;
 use starry_vm::VmMutPtr;
 
+use super::ProcessSignalManager;
 use crate::{
     DefaultSignalAction, PendingSignals, SignalAction, SignalActionFlags, SignalDisposition,
     SignalInfo, SignalOSAction, SignalSet, SignalStack, Signo, arch::UContext,
 };
 
-use super::ProcessSignalManager;
-
 struct SignalFrame {
     ucontext: UContext,
     siginfo: SignalInfo,
@@ -188,7 +187,7 @@ impl ThreadSignalManager {
     /// Restores the signal frame. Called by `sigreturn`.
     pub fn restore(&self, uctx: &mut UserContext) {
         let frame_ptr = uctx.sp() as *const SignalFrame;
-        // SAFETY: pointer is valid
+        // FIXME: remove this `unsafe`
         let frame = unsafe { &*frame_ptr };
 
         *uctx = frame.uctx;

src/pending.rs

@@ -1,6 +1,5 @@
-use core::array;
-
 use alloc::{boxed::Box, collections::vec_deque::VecDeque};
+use core::array;
 
 use crate::{SignalInfo, SignalSet};
 

src/types.rs

@@ -10,70 +10,70 @@ use crate::DefaultSignalAction;
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, FromRepr, EnumIter)]
 pub enum Signo {
-    SIGHUP = 1,
-    SIGINT = 2,
-    SIGQUIT = 3,
-    SIGILL = 4,
-    SIGTRAP = 5,
-    SIGABRT = 6,
-    SIGBUS = 7,
-    SIGFPE = 8,
-    SIGKILL = 9,
-    SIGUSR1 = 10,
-    SIGSEGV = 11,
-    SIGUSR2 = 12,
-    SIGPIPE = 13,
-    SIGALRM = 14,
-    SIGTERM = 15,
+    SIGHUP    = 1,
+    SIGINT    = 2,
+    SIGQUIT   = 3,
+    SIGILL    = 4,
+    SIGTRAP   = 5,
+    SIGABRT   = 6,
+    SIGBUS    = 7,
+    SIGFPE    = 8,
+    SIGKILL   = 9,
+    SIGUSR1   = 10,
+    SIGSEGV   = 11,
+    SIGUSR2   = 12,
+    SIGPIPE   = 13,
+    SIGALRM   = 14,
+    SIGTERM   = 15,
     SIGSTKFLT = 16,
-    SIGCHLD = 17,
-    SIGCONT = 18,
-    SIGSTOP = 19,
-    SIGTSTP = 20,
-    SIGTTIN = 21,
-    SIGTTOU = 22,
-    SIGURG = 23,
-    SIGXCPU = 24,
-    SIGXFSZ = 25,
+    SIGCHLD   = 17,
+    SIGCONT   = 18,
+    SIGSTOP   = 19,
+    SIGTSTP   = 20,
+    SIGTTIN   = 21,
+    SIGTTOU   = 22,
+    SIGURG    = 23,
+    SIGXCPU   = 24,
+    SIGXFSZ   = 25,
     SIGVTALRM = 26,
-    SIGPROF = 27,
-    SIGWINCH = 28,
-    SIGIO = 29,
-    SIGPWR = 30,
-    SIGSYS = 31,
-    SIGRTMIN = 32,
-    SIGRT1 = 33,
-    SIGRT2 = 34,
-    SIGRT3 = 35,
-    SIGRT4 = 36,
-    SIGRT5 = 37,
-    SIGRT6 = 38,
-    SIGRT7 = 39,
-    SIGRT8 = 40,
-    SIGRT9 = 41,
-    SIGRT10 = 42,
-    SIGRT11 = 43,
-    SIGRT12 = 44,
-    SIGRT13 = 45,
-    SIGRT14 = 46,
-    SIGRT15 = 47,
-    SIGRT16 = 48,
-    SIGRT17 = 49,
-    SIGRT18 = 50,
-    SIGRT19 = 51,
-    SIGRT20 = 52,
-    SIGRT21 = 53,
-    SIGRT22 = 54,
-    SIGRT23 = 55,
-    SIGRT24 = 56,
-    SIGRT25 = 57,
-    SIGRT26 = 58,
-    SIGRT27 = 59,
-    SIGRT28 = 60,
-    SIGRT29 = 61,
-    SIGRT30 = 62,
-    SIGRT31 = 63,
-    SIGRT32 = 64,
+    SIGPROF   = 27,
+    SIGWINCH  = 28,
+    SIGIO     = 29,
+    SIGPWR    = 30,
+    SIGSYS    = 31,
+    SIGRTMIN  = 32,
+    SIGRT1    = 33,
+    SIGRT2    = 34,
+    SIGRT3    = 35,
+    SIGRT4    = 36,
+    SIGRT5    = 37,
+    SIGRT6    = 38,
+    SIGRT7    = 39,
+    SIGRT8    = 40,
+    SIGRT9    = 41,
+    SIGRT10   = 42,
+    SIGRT11   = 43,
+    SIGRT12   = 44,
+    SIGRT13   = 45,
+    SIGRT14   = 46,
+    SIGRT15   = 47,
+    SIGRT16   = 48,
+    SIGRT17   = 49,
+    SIGRT18   = 50,
+    SIGRT19   = 51,
+    SIGRT20   = 52,
+    SIGRT21   = 53,
+    SIGRT22   = 54,
+    SIGRT23   = 55,
+    SIGRT24   = 56,
+    SIGRT25   = 57,
+    SIGRT26   = 58,
+    SIGRT27   = 59,
+    SIGRT28   = 60,
+    SIGRT29   = 61,
+    SIGRT30   = 62,
+    SIGRT31   = 63,
+    SIGRT32   = 64,
 }
 
 impl Signo {
@@ -211,6 +211,7 @@ impl SignalInfo {
         result.set_code(SI_KERNEL as _);
         result
     }
+
     pub fn new_user(signo: Signo, code: i32, pid: u32) -> Self {
         // FIXME: Zeroable
         let mut result: Self = unsafe { mem::zeroed() };
@@ -243,8 +244,9 @@ impl SignalInfo {
     }
 
     pub fn errno(&self) -> i32 {
-        // SAFETY: The union layout matches Linux's siginfo_t definition. bindgen keeps this layout,
-        // so it is safe to read the errno field through the anonymous union.
+        // SAFETY: The union layout matches Linux's siginfo_t definition. bindgen keeps
+        // this layout, so it is safe to read the errno field through the
+        // anonymous union.
         unsafe { self.0.__bindgen_anon_1.__bindgen_anon_1.si_errno }
     }
 }