rustlib

@@ -1 +1 @@
-Subproject commit 0d9cd0822c355e784c6f4ff5ac2fd88f6d917ea7
+Subproject commit a7d79f8d3d865c93dad38796530e6a4dc53a0377

src/Makefile

@@ -37,16 +37,8 @@ ifeq (${ARCH},x86_64)
 endif
 
 RUSTLIB_PATH = ../rustlib/${ARCH}/lib
-RUST_LIBS = "${RUSTLIB_PATH}/libaddr2line.rlib" "${RUSTLIB_PATH}/libadler.rlib" \
+RUST_LIBS = "${RUSTLIB_PATH}/liballoc.rlib" "${RUSTLIB_PATH}/libcompiler_builtins.rlib" \
-	"${RUSTLIB_PATH}/liballoc.rlib" "${RUSTLIB_PATH}/libcfg_if.rlib" "${RUSTLIB_PATH}/libcompiler_builtins.rlib" \
+	"${RUSTLIB_PATH}/libcore.rlib" "${RUSTLIB_PATH}/librustc_std_workspace_core.rlib"
-	"${RUSTLIB_PATH}/libcore.rlib" "${RUSTLIB_PATH}/libgetopts.rlib" "${RUSTLIB_PATH}/libgimli.rlib" \
-	"${RUSTLIB_PATH}/libhashbrown.rlib" "${RUSTLIB_PATH}/libmemchr.rlib" "${RUSTLIB_PATH}/libminiz_oxide.rlib" \
-	"${RUSTLIB_PATH}/libobject.rlib" "${RUSTLIB_PATH}/libpanic_abort.rlib" "${RUSTLIB_PATH}/libpanic_unwind.rlib" \
-	"${RUSTLIB_PATH}/libproc_macro.rlib" "${RUSTLIB_PATH}/libprofiler_builtins.rlib" \
-	"${RUSTLIB_PATH}/librustc_demangle.rlib" "${RUSTLIB_PATH}/librustc_std_workspace_alloc.rlib" \
-	"${RUSTLIB_PATH}/librustc_std_workspace_core.rlib" "${RUSTLIB_PATH}/librustc_std_workspace_std.rlib" \
-	"${RUSTLIB_PATH}/libstd_detect.rlib" "${RUSTLIB_PATH}/libstd.rlib" "${RUSTLIB_PATH}/libsysroot.rlib" \
-	"${RUSTLIB_PATH}/libtest.rlib" "${RUSTLIB_PATH}/libunicode_width.rlib" "${RUSTLIB_PATH}/libunwind.rlib"
 
 ################################
 

src/kernel/clock/time.rs

@@ -1,4 +1,6 @@
-use std::{cmp::Ordering, fmt::Debug, ops::Sub, time::Duration};
+use core::{cmp::Ordering, ops::Sub, time::Duration};
+
+use alloc::{format, string::ToString};
 
 extern "C" {
     fn system_time_get() -> usize;
@@ -14,8 +16,8 @@ pub struct SystemTime {
     ns_time: usize,
 }
 
-impl Debug for SystemTime {
+impl ToString for SystemTime {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    fn to_string(&self) -> alloc::string::String {
         let second_dur = 1000usize;
         let minute_dur = second_dur * 60;
         let hour_dur = minute_dur * 60;
@@ -93,8 +95,7 @@ impl Debug for SystemTime {
         minute /= minute_dur;
         let milisec = second % second_dur;
         second /= second_dur;
-        write!(
+        format!(
-            f,
             "[{:02}-{:02}-{:02} {:02}:{:02}:{:02}.{:03}]",
             year, month, day, hour, minute, second, milisec
         )
@@ -118,7 +119,7 @@ impl Ord for SystemTime {
 }
 
 impl PartialOrd for SystemTime {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         match self.unix_time.partial_cmp(&other.unix_time) {
             Some(Ordering::Equal) => self.ns_time.partial_cmp(&other.ns_time),
             ord => ord,

src/kernel/klog.rs

@@ -1,3 +1,7 @@
+use alloc::string::ToString;
+use alloc::{format, vec::Vec};
+use alloc::vec;
+
 use super::{
     clock::time::SystemTime,
     tty::tty::{Color, Message, MessageBuilder},
@@ -149,7 +153,7 @@ impl Iterator for LogIterator {
         if let Some((time, msg)) = self.logs.first() {
             Some(
                 MessageBuilder::new()
-                    .message(format!("{:?}", time))
+                    .message(format!("{}", time.to_string()))
                     .append(MessageBuilder::from_message(msg))
                     .build(),
             )

src/kernel/sync/rwlock.rs

@@ -1,19 +1,18 @@
-use std::{
+use core::{ops::{Deref, DerefMut}, ptr::null_mut};
-    ops::{Deref, DerefMut},
+
-    ptr::null_mut,
+use alloc::{vec, vec::Vec};
-};
 
 /// ## RwLock<T>
 /// 读写锁
-/// 
+///
 /// * 对于写入操作：
-/// 
+///
 /// 锁没有占用时，获取锁，并执行闭包。
-/// 
+///
 /// 当锁已经被占用，将闭包悬挂。
-/// 
+///
 /// 释放锁时，将所有悬挂的闭包都执行。
-/// 
+///
 /// 正在释放锁时，`write`方法返回`Err(())`
 ///
 /// ```

src/kernel/tty/tty.rs

@@ -1,4 +1,11 @@
-use std::{fmt::Debug, ptr::null_mut};
+use core::ptr::null_mut;
+
+use alloc::{
+    format,
+    string::{String, ToString},
+    vec,
+    vec::Vec,
+};
 
 extern "C" {
     fn tty_new(tty_type: u8, mode: u8) -> *mut u8;
@@ -140,13 +147,7 @@ pub struct Color(pub u8, pub u8, pub u8);
 
 impl ToString for Color {
     fn to_string(&self) -> String {
-        format!("Color({:02x}, {:02x}, {:02x})", self.0, self.1, self.2)
+        format!("{:02x}{:02x}{:02x}", self.0, self.1, self.2)
-    }
-}
-
-impl Debug for Color {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:02x}{:02x}{:02x}", self.0, self.1, self.2)
     }
 }
 
@@ -165,11 +166,13 @@ impl ColorPair {
     }
 }
 
-impl Debug for ColorPair {
+impl ToString for ColorPair {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    fn to_string(&self) -> String {
         match self {
-            ColorPair::Reset => write!(f, "\x1b{{}}"),
+            ColorPair::Reset => format!("\x1b{{}}"),
-            ColorPair::Color { fore, back } => write!(f, "\x1b{{{:?}{:?}}}", fore, back),
+            ColorPair::Color { fore, back } => {
+                format!("\x1b{{{}{}}}", fore.to_string(), back.to_string())
+            }
         }
     }
 }

src/lib.rs

@@ -1,4 +1,6 @@
-extern crate core;
+#![no_std]
+
+extern crate alloc;
 
 pub mod kernel;
 pub mod libk;