Skip to content

Commit 458213e

Browse files
committed
fix: rustfmt
Signed-off-by: Woshiluo Luo <[email protected]>
1 parent 070cafe commit 458213e

File tree

14 files changed

+27
-20
lines changed

14 files changed

+27
-20
lines changed

examples/qemu-virt.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ use serde_derive::Deserialize;
1111
// - `NodeSeq`: name@... 区分的一组同级同类的连续节点,这个类型要求可变的内存。
1212
// - `StrSeq`: '\0' 分隔的一组字符串,设备树中一种常见的属性类型,这个类型要求可变的内存。
1313
use serde_device_tree::{
14+
Dtb, DtbPtr,
1415
buildin::{Node, NodeSeq, Reg, StrSeq},
1516
error::Error,
16-
from_raw_mut, Dtb, DtbPtr,
17+
from_raw_mut,
1718
};
1819

1920
const RAW_DEVICE_TREE: &[u8] = include_bytes!("qemu-virt.dtb");

rustfmt.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Use rustfmt to format code
2+
3+
edition = "2024"
4+
# Empty file.

src/de_mut/cursor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use super::{DtError, RefDtb, StructureBlock, BLOCK_LEN};
1+
use super::{BLOCK_LEN, DtError, RefDtb, StructureBlock};
22
use core::marker::PhantomData;
33

44
#[derive(Clone, Copy, Debug)]

src/de_mut/data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use super::{BodyCursor, Cursor};
1+
use super::{BodyCursor, Cursor};
22
use super::{DtError, PropCursor, RefDtb, RegConfig};
33

44
use core::marker::PhantomData;
5-
use serde::{de, Deserialize};
5+
use serde::{Deserialize, de};
66

77
#[derive(Clone, Copy, Debug)]
88
pub(super) enum ValueCursor {

src/de_mut/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! Deserialize device tree data to a Rust data structure,
1+
//! Deserialize device tree data to a Rust data structure,
22
//! the memory region contains dtb file should be mutable.
33
44
use crate::error::Error as DtError;
@@ -26,7 +26,7 @@ use cursor::{BodyCursor, Cursor, PropCursor};
2626
use data::{ValueCursor, ValueDeserializer};
2727
use reg::RegConfig;
2828
use struct_access::{StructAccess, StructAccessType, Temp};
29-
use structs::{RefDtb, StructureBlock, BLOCK_LEN};
29+
use structs::{BLOCK_LEN, RefDtb, StructureBlock};
3030

3131
/// 从 [`RefDtb`] 反序列化一个描述设备树的 `T` 类型实例。
3232
///

src/de_mut/node.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use super::{BodyCursor, Cursor, PropCursor, RefDtb, RegConfig, ValueCursor, ValueDeserializer};
1+
use super::{BodyCursor, Cursor, PropCursor, RefDtb, RegConfig, ValueCursor, ValueDeserializer};
22
use core::fmt::Debug;
33
use core::marker::PhantomData;
44
use serde::de::MapAccess;
5-
use serde::{de, Deserialize};
5+
use serde::{Deserialize, de};
66

77
// TODO: Spec 2.3.5 said that we should not inherited from ancestors and the size-cell &
88
// address-cells should only used for current node's children.
@@ -291,7 +291,7 @@ impl<'de> PropItem<'de> {
291291

292292
#[cfg(test)]
293293
mod tests {
294-
use crate::{buildin::Node, from_raw_mut, Dtb, DtbPtr};
294+
use crate::{Dtb, DtbPtr, buildin::Node, from_raw_mut};
295295
const RAW_DEVICE_TREE: &[u8] = include_bytes!("../../examples/hifive-unmatched-a00.dtb");
296296
const BUFFER_SIZE: usize = RAW_DEVICE_TREE.len();
297297
#[repr(align(8))]

src/de_mut/node_seq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::{BodyCursor, Cursor, RefDtb, RegConfig, ValueCursor, ValueDeserializer};
22
use core::{fmt::Debug, marker::PhantomData};
33
use serde::de::SeqAccess;
4-
use serde::{de, Deserialize};
4+
use serde::{Deserialize, de};
55

66
/// 一组名字以 `@...` 区分,同类、同级且连续的节点的映射。
77
///

src/de_mut/reg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use super::{PropCursor, RefDtb, ValueCursor, BLOCK_LEN};
1+
use super::{BLOCK_LEN, PropCursor, RefDtb, ValueCursor};
22
use core::{fmt::Debug, ops::Range};
33
use serde::Deserialize;
44

src/de_mut/structs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::{
2-
common::{Header, ALIGN},
1+
use crate::{
2+
common::{ALIGN, Header},
33
error::Error as DtError,
44
};
55
use core::{cell::RefCell, fmt::Display};

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub use value::compatible::Compatible;
3434
pub use de::from_raw;
3535

3636
#[doc(inline)]
37-
pub use de_mut::{buildin, from_raw_mut, Dtb, DtbPtr};
37+
pub use de_mut::{Dtb, DtbPtr, buildin, from_raw_mut};
3838

3939
#[doc(inline)]
4040
pub use error::Result;

0 commit comments

Comments
 (0)