Skip to content

Commit 85163df

Browse files
committed
fix: fmt code and define edition in workspace level
1 parent f4e85f6 commit 85163df

File tree

9 files changed

+16
-13
lines changed

9 files changed

+16
-13
lines changed

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
resolver = "3"
33
members = ["xtask", "fast-trap", "test-app"]
44
default-members = ["xtask"]
5+
6+
[workspace.package]
7+
edition = "2024"

fast-trap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "fast-trap"
33
description = "Provide a framework for bare-metal trap handling, aiming at ensuring performance while reusing code."
44
version = "0.0.1"
5-
edition = "2024"
5+
edition.workspace = true
66
authors = ["YdrMaster <ydrml@hotmail.com>"]
77
repository = "https://github.com/YdrMaster/fast-trap.git"
88
documentation = "https://docs.rs/fast-trap"

fast-trap/src/entire.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use crate::{FlowContext, TrapHandler};
1+
use crate::{FlowContext, TrapHandler};
22
use core::{
33
marker::PhantomData,
4-
mem::{forget, MaybeUninit},
4+
mem::{MaybeUninit, forget},
55
ops::{Deref, DerefMut},
66
ptr::NonNull,
77
};

fast-trap/src/hal/riscv/riscv_m.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use super::{trap_entry, FlowContext};
1+
use super::{FlowContext, trap_entry};
22
use core::arch::asm;
33

44
macro_rules! exchange {

fast-trap/src/hal/riscv/riscv_s.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use super::{trap_entry, FlowContext};
1+
use super::{FlowContext, trap_entry};
22
use core::arch::asm;
33

44
macro_rules! exchange {

fast-trap/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ mod hal;
1010

1111
pub use entire::*;
1212
pub use fast::*;
13-
pub use hal::{load_direct_trap_entry, reuse_stack_for_trap, soft_trap, trap_entry, FlowContext};
13+
pub use hal::{FlowContext, load_direct_trap_entry, reuse_stack_for_trap, soft_trap, trap_entry};
1414

1515
use core::{
1616
alloc::Layout,
1717
marker::PhantomPinned,
18-
mem::{align_of, forget, MaybeUninit},
18+
mem::{MaybeUninit, align_of, forget},
1919
ops::Range,
2020
ptr::NonNull,
2121
};

test-app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "test-app"
33
version = "0.0.0"
4-
edition = "2024"
4+
edition.workspace = true
55
authors = ["YdrMaster <ydrml@hotmail.com>"]
66
publish = false
77

test-app/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
use core::{
77
arch::asm,
8-
mem::{forget, MaybeUninit},
9-
ptr::{null, NonNull},
8+
mem::{MaybeUninit, forget},
9+
ptr::{NonNull, null},
1010
unreachable,
1111
};
1212
use dtb_walker::{Dtb, DtbObj, HeaderError, Str, WalkOperation};
1313
use fast_trap::{
14-
load_direct_trap_entry, reuse_stack_for_trap, soft_trap, trap_entry, FastContext, FastResult,
15-
FlowContext, FreeTrapStack,
14+
FastContext, FastResult, FlowContext, FreeTrapStack, load_direct_trap_entry,
15+
reuse_stack_for_trap, soft_trap, trap_entry,
1616
};
1717
use rcore_console::log;
1818
use riscv::register::*;

xtask/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "xtask"
33
version = "0.1.0"
4-
edition = "2024"
4+
edition.workspace = true
55
authors = ["YdrMaster <ydrml@hotmail.com>"]
66
publish = false
77

0 commit comments

Comments
 (0)