update

kern-crates · Jan 21, 2025 · 1ef72f8 · 1ef72f8
1 parent 7d30b15
commit 1ef72f8
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-resolver = "3"
+resolver = "2"
 members = ["app/*", "crates/*"]
 
 [workspace.package]

diff --git a/crates/bare-test-macros/Cargo.toml b/crates/bare-test-macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bare-test-macros"
 version = "0.2.0"
-edition = "2021"
+edition.workspace = true
 license = "MIT"
 description = "macros for bare-test"
 authors = ["周睿 <[email protected]>"]

diff --git a/crates/bare-test-macros/src/lib.rs b/crates/bare-test-macros/src/lib.rs
@@ -6,7 +6,7 @@ extern crate proc_macro2;
 extern crate syn;
 
 use proc_macro::TokenStream;
-use syn::{parse, spanned::Spanned, Item, ItemMod};
+use syn::{Item, ItemMod, parse, spanned::Spanned};
 
 #[proc_macro]
 pub fn build_test_setup(_input: TokenStream) -> TokenStream {

diff --git a/crates/bare-test/Cargo.toml b/crates/bare-test/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bare-test"
 version = "0.3.1"
 authors = ["Zhourui <[email protected]>"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/qclic/sparreal-os/tree/main/crates/bare-test"
 license = "MPL-2.0"
 description = "A test framework for bare metal."

diff --git a/crates/driver-interface/Cargo.toml b/crates/driver-interface/Cargo.toml
@@ -2,7 +2,7 @@
 name = "driver-interface"
 version = "0.2.0"
 authors = ["Zhourui <[email protected]>"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/qclic/sparreal-os"
 license = "MPL-2.0"
 description = "Sparreal OS kernel"

diff --git a/crates/driver-interface/src/interrupt_controller.rs b/crates/driver-interface/src/interrupt_controller.rs
@@ -1,6 +1,6 @@
 use core::{error::Error, fmt::Debug};
 
-use crate::{custom_type, DriverGeneric, RegAddress};
+use crate::{DriverGeneric, RegAddress, custom_type};
 use alloc::{boxed::Box, vec::Vec};
 
 custom_type!(IrqId, usize, "{:#x}");

diff --git a/crates/driver-interface/src/timer/mod.rs b/crates/driver-interface/src/timer/mod.rs
@@ -1,9 +1,9 @@
 use core::{
-    sync::atomic::{fence, Ordering},
+    sync::atomic::{Ordering, fence},
     time::Duration,
 };
 
-use crate::{interrupt_controller::IrqConfig, DriverGeneric};
+use crate::{DriverGeneric, interrupt_controller::IrqConfig};
 use alloc::{boxed::Box, vec::Vec};
 
 mod queue;

diff --git a/crates/page-table-arm/Cargo.toml b/crates/page-table-arm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "page-table-arm"
 description = "A library of arm page table"
 version = "0.1.0"
-edition = "2024"
+edition.workspace = true
 authors = ["周睿 <[email protected]>"]
 repository = "https://github.com/qclic/sparreal-os/tree/main/crates/page-table-arm"
 documentation = "https://docs.rs/page-table-arm"

diff --git a/crates/sparreal-kernel/Cargo.toml b/crates/sparreal-kernel/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sparreal-kernel"
 version.workspace = true
 authors = ["周睿 <[email protected]>"]
-edition = "2024"
+edition.workspace = true
 repository = "https://github.com/ZR233/sparreal-os"
 license = "MPL-2.0"
 description = "Sparreal OS kernel"

diff --git a/crates/sparreal-kernel/src/async_std/time.rs b/crates/sparreal-kernel/src/async_std/time.rs
@@ -1,3 +1,4 @@
+use core::future::Future;
 use core::time::Duration;
 
 use crate::time::since_boot;

diff --git a/crates/sparreal-macros/Cargo.toml b/crates/sparreal-macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sparreal-macros"
 version.workspace = true
-edition = "2024"
+edition.workspace = true
 license = "MIT"
 description = "macros for sparreal"
 authors = ["周睿 <[email protected]>"]

diff --git a/crates/sparreal-rt/Cargo.toml b/crates/sparreal-rt/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sparreal-rt"
 version.workspace = true
 authors = ["周睿 <[email protected]>"]
-edition = "2024"
+edition.workspace = true
 repository = "https://github.com/ZR233/sparreal-os"
 license = "MPL-2.0"
 description = "Sparreal OS Runtime"