From 3d27b376d7e9780aa2f8c75b0c472409b4cf529d Mon Sep 17 00:00:00 2001
From: Ruihan Li <lrh2000@pku.edu.cn>
Date: Mon, 12 Jan 2026 23:53:54 +0800
Subject: [PATCH] Keep various things sorted

---
 CODEOWNERS      |  6 +++---
 Cargo.toml      | 20 ++++++++++----------
 Components.toml | 26 +++++++++++++-------------
 Makefile        | 14 +++++++-------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index d6d264907..90e63d403 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -28,7 +28,7 @@
 #=============================================================================
 
 /book/                          @tatetian
-/book/src/kernel/linux-compatibility/syscall-flag-coverage/ @tatetian @taosue
+/book/src/kernel/linux-compatibility/syscall-flag-coverage/ @taosue @tatetian
 
 #=============================================================================
 # The Asterinas kernel
@@ -85,7 +85,7 @@
 /osdk/tools/docker/             @grief8
 /test/                          @cqs21
 /tools/                         @grief8
-/tools/sctrace/                 @tatetian @taosue
+/tools/sctrace/                 @taosue @tatetian
 /triagebot.toml                 @grief8
 
 /Makefile                       @junyang-zh
@@ -93,5 +93,5 @@
 
 # The following critical files are singled out
 /CODEOWNERS                     @tatetian
-/VERSION                        @tatetian
 /RELEASES                       @tatetian
+/VERSION                        @tatetian
diff --git a/Cargo.toml b/Cargo.toml
index b5f8df9b3..0199f977f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,41 +13,41 @@ members = [
     "osdk/deps/test-kernel",
     "ostd",
     "ostd/libs/align_ext",
-    "ostd/libs/ostd-macros",
     "ostd/libs/id-alloc",
     "ostd/libs/int-to-c-enum",
     "ostd/libs/int-to-c-enum/derive",
-    "ostd/libs/linux-bzimage/builder",
     "ostd/libs/linux-bzimage/boot-params",
+    "ostd/libs/linux-bzimage/builder",
     "ostd/libs/linux-bzimage/setup",
+    "ostd/libs/ostd-macros",
     "ostd/libs/ostd-test",
     "kernel",
     "kernel/comps/block",
     "kernel/comps/cmdline",
     "kernel/comps/console",
     "kernel/comps/framebuffer",
-    "kernel/comps/input",
     "kernel/comps/i8042",
-    "kernel/comps/network",
-    "kernel/comps/softirq",
-    "kernel/comps/systree",
+    "kernel/comps/input",
     "kernel/comps/logger",
     "kernel/comps/mlsdisk",
+    "kernel/comps/network",
+    "kernel/comps/pci",
+    "kernel/comps/softirq",
+    "kernel/comps/systree",
     "kernel/comps/time",
     "kernel/comps/virtio",
-    "kernel/comps/pci",
-    "kernel/libs/cpio-decoder",
+    "kernel/libs/aster-bigtcp",
     "kernel/libs/aster-rights",
     "kernel/libs/aster-rights-proc",
     "kernel/libs/aster-util",
-    "kernel/libs/aster-bigtcp",
+    "kernel/libs/atomic-integer-wrapper",
+    "kernel/libs/cpio-decoder",
     "kernel/libs/device-id",
     "kernel/libs/jhash",
     "kernel/libs/keyable-arc",
     "kernel/libs/logo-ascii-art",
     "kernel/libs/typeflags",
     "kernel/libs/typeflags-util",
-    "kernel/libs/atomic-integer-wrapper",
     "kernel/libs/xarray",
 ]
 exclude = [
diff --git a/Components.toml b/Components.toml
index 7bc39d6de..f73ab22ec 100644
--- a/Components.toml
+++ b/Components.toml
@@ -1,20 +1,20 @@
 # template
 [components]
-kernel = { name = "aster-kernel" }
-virtio = { name = "aster-virtio" }
-input = { name = "aster-input" }
 block = { name = "aster-block" }
-console = { name = "aster-console" }
-softirq = { name = "aster-softirq" }
-logger = { name = "aster-logger" }
-time = { name = "aster-time" }
-framebuffer = { name = "aster-framebuffer" }
-network = { name = "aster-network" }
-mlsdisk = { name = "aster-mlsdisk" }
-systree = { name = "aster-systree" }
-i8042 = { name = "aster-i8042" }
-pci = { name = "aster-pci" }
 cmdline = { name = "aster-cmdline" }
+console = { name = "aster-console" }
+framebuffer = { name = "aster-framebuffer" }
+i8042 = { name = "aster-i8042" }
+input = { name = "aster-input" }
+kernel = { name = "aster-kernel" }
+logger = { name = "aster-logger" }
+mlsdisk = { name = "aster-mlsdisk" }
+network = { name = "aster-network" }
+pci = { name = "aster-pci" }
+softirq = { name = "aster-softirq" }
+systree = { name = "aster-systree" }
+time = { name = "aster-time" }
+virtio = { name = "aster-virtio" }
 
 [whitelist]
 [whitelist.nix.main]
diff --git a/Makefile b/Makefile
index d1cf8c06f..d566554d9 100644
--- a/Makefile
+++ b/Makefile
@@ -209,8 +209,8 @@ NON_OSDK_CRATES := \
 	ostd/libs/id-alloc \
 	ostd/libs/int-to-c-enum \
 	ostd/libs/int-to-c-enum/derive \
-	ostd/libs/linux-bzimage/builder \
 	ostd/libs/linux-bzimage/boot-params \
+	ostd/libs/linux-bzimage/builder \
 	ostd/libs/ostd-macros \
 	ostd/libs/ostd-test \
 	kernel/libs/aster-rights \
@@ -236,18 +236,18 @@ OSDK_CRATES := \
 	kernel/comps/cmdline \
 	kernel/comps/console \
 	kernel/comps/framebuffer \
-	kernel/comps/input \
 	kernel/comps/i8042 \
-	kernel/comps/network \
-	kernel/comps/softirq \
-	kernel/comps/systree \
+	kernel/comps/input \
 	kernel/comps/logger \
 	kernel/comps/mlsdisk \
+	kernel/comps/network \
+	kernel/comps/pci \
+	kernel/comps/softirq \
+	kernel/comps/systree \
 	kernel/comps/time \
 	kernel/comps/virtio \
-	kernel/comps/pci \
-	kernel/libs/aster-util \
 	kernel/libs/aster-bigtcp \
+	kernel/libs/aster-util \
 	kernel/libs/device-id \
 	kernel/libs/xarray