Skip to content

Commit bdd633a

Browse files
committed
fix: make clippy happy
Signed-off-by: Woshiluo Luo <woshiluo.luo@outlook.com>
1 parent 4b6fd9d commit bdd633a

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

examples/hifive-unmatched-a00.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct Cpu<'a> {
4646
compatible: Compatible<'a>,
4747
}
4848

49-
const RAW_DEVICE_TREE: &'static [u8] = include_bytes!("hifive-unmatched-a00.dtb");
49+
const RAW_DEVICE_TREE: &[u8] = include_bytes!("hifive-unmatched-a00.dtb");
5050
const BUFFER_SIZE: usize = RAW_DEVICE_TREE.len();
5151

5252
#[repr(align(4))]
@@ -58,7 +58,7 @@ fn main() {
5858
let mut aligned_data: Box<AlignedBuffer> = Box::new(AlignedBuffer {
5959
data: [0; BUFFER_SIZE],
6060
});
61-
aligned_data.data[..BUFFER_SIZE].clone_from_slice(&RAW_DEVICE_TREE);
61+
aligned_data.data[..BUFFER_SIZE].clone_from_slice(RAW_DEVICE_TREE);
6262
let ptr = aligned_data.data.as_ptr();
6363
let t: Tree = unsafe { serde_device_tree::from_raw(ptr) }.unwrap();
6464
println!("#address_cells = {}", t.num_address_cells);

examples/qemu-virt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use serde_device_tree::{
1616
from_raw_mut, Dtb, DtbPtr,
1717
};
1818

19-
const RAW_DEVICE_TREE: &'static [u8] = include_bytes!("qemu-virt.dtb");
19+
const RAW_DEVICE_TREE: &[u8] = include_bytes!("qemu-virt.dtb");
2020
const BUFFER_SIZE: usize = RAW_DEVICE_TREE.len();
2121

2222
#[repr(align(4))]
@@ -29,7 +29,7 @@ fn main() -> Result<(), Error> {
2929
let mut aligned_data: Box<AlignedBuffer> = Box::new(AlignedBuffer {
3030
data: [0; BUFFER_SIZE],
3131
});
32-
aligned_data.data[..BUFFER_SIZE].clone_from_slice(&RAW_DEVICE_TREE);
32+
aligned_data.data[..BUFFER_SIZE].clone_from_slice(RAW_DEVICE_TREE);
3333
let mut slice = aligned_data.data.to_vec();
3434
// 这一步验证了设备树首部的正确性,`DtbPtr` 类型可以安全地传递到任何地方,
3535
// 甚至跨地址空间(如果你知道偏移的话)。

src/de.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl<'a> Deserializer<'a> {
130130
}
131131
}
132132

133-
impl<'de, 'b> de::Deserializer<'de> for &'b mut Deserializer<'de> {
133+
impl<'de> de::Deserializer<'de> for &mut Deserializer<'de> {
134134
type Error = Error;
135135

136136
fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
@@ -468,7 +468,7 @@ impl<'de, 'b> MapVisitor<'de, 'b> {
468468
}
469469
}
470470

471-
impl<'de, 'b> de::MapAccess<'de> for MapVisitor<'de, 'b> {
471+
impl<'de> de::MapAccess<'de> for MapVisitor<'de, '_> {
472472
type Error = Error;
473473

474474
fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>>
@@ -512,7 +512,7 @@ mod tests {
512512
#[cfg(any(feature = "std", feature = "alloc"))]
513513
#[test]
514514
fn error_invalid_magic() {
515-
static DEVICE_TREE: &'static [u8] = &[0x11, 0x22, 0x33, 0x44]; // not device tree blob format
515+
static DEVICE_TREE: &[u8] = &[0x11, 0x22, 0x33, 0x44]; // not device tree blob format
516516
let ptr = DEVICE_TREE.as_ptr();
517517

518518
#[derive(Debug, Deserialize)]

src/de_mut/cursor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,5 +339,5 @@ impl Cursor {
339339

340340
#[inline]
341341
const fn align(len: usize, align: usize) -> usize {
342-
(len + align - 1) / align
342+
len.div_ceil(align)
343343
}

src/de_mut/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub(super) struct BorrowedValueDeserializer<'de> {
77
pub cursor: PropCursor,
88
}
99

10-
impl<'de, 'b> de::Deserializer<'de> for &'b mut BorrowedValueDeserializer<'de> {
10+
impl<'de> de::Deserializer<'de> for &mut BorrowedValueDeserializer<'de> {
1111
type Error = DtError;
1212

1313
fn deserialize_any<V>(self, _visitor: V) -> Result<V::Value, Self::Error>

src/de_mut/group.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub(super) struct GroupDeserializer<'de> {
1111
pub len_name: usize,
1212
}
1313

14-
impl<'de, 'b> de::Deserializer<'de> for &'b mut GroupDeserializer<'de> {
14+
impl<'de> de::Deserializer<'de> for &mut GroupDeserializer<'de> {
1515
type Error = DtError;
1616

1717
fn deserialize_any<V>(self, _visitor: V) -> Result<V::Value, Self::Error>

src/de_mut/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ enum Temp {
7171
Prop(PropCursor),
7272
}
7373

74-
impl<'de, 'b> de::MapAccess<'de> for StructAccess<'de, 'b> {
74+
impl<'de> de::MapAccess<'de> for StructAccess<'de, '_> {
7575
type Error = DtError;
7676

7777
fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, Self::Error>

src/de_mut/node.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ impl<'de> Node<'de> {
6464
Cursor::Title(c) => {
6565
let (name, _) = c.split_on(dtb);
6666
let (_, next) = c.take_node_on(dtb, name);
67-
if let None = node {
67+
if node.is_none() {
6868
node = Some(cursor)
6969
}
7070
cursor = next;
7171
}
7272
Cursor::Prop(c) => {
7373
let (_, next) = c.name_on(dtb);
74-
if let None = prop {
74+
if prop.is_none() {
7575
prop = Some(cursor)
7676
}
7777
cursor = next;
@@ -130,7 +130,7 @@ impl Debug for Node<'_> {
130130
}
131131
}
132132
}
133-
write!(f, "]\n")?;
133+
writeln!(f, "]")?;
134134

135135
let children = self.nodes();
136136
write!(f, "Children: [")?;
@@ -145,13 +145,13 @@ impl Debug for Node<'_> {
145145
}
146146
}
147147
}
148-
write!(f, "]\n")?;
148+
writeln!(f, "]")?;
149149

150150
Ok(())
151151
}
152152
}
153153

154-
impl<'de, 'b> Iterator for NodeIter<'de, 'b> {
154+
impl<'de> Iterator for NodeIter<'de, '_> {
155155
type Item = NodeItem<'de>;
156156

157157
fn next(&mut self) -> Option<Self::Item> {
@@ -174,7 +174,7 @@ impl<'de, 'b> Iterator for NodeIter<'de, 'b> {
174174
}
175175
}
176176

177-
impl<'de, 'b> Iterator for PropIter<'de, 'b> {
177+
impl<'de> Iterator for PropIter<'de, '_> {
178178
type Item = PropItem<'de>;
179179

180180
fn next(&mut self) -> Option<Self::Item> {
@@ -196,7 +196,7 @@ impl<'de, 'b> Iterator for PropIter<'de, 'b> {
196196
}
197197
}
198198

199-
impl<'de, 'b> Deserialize<'de> for Node<'b> {
199+
impl<'de> Deserialize<'de> for Node<'_> {
200200
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
201201
where
202202
D: serde::Deserializer<'de>,
@@ -248,7 +248,7 @@ impl<'de> NodeItem<'de> {
248248
}
249249

250250
pub fn get_parsed_name(&self) -> (&str, Option<&str>) {
251-
if let Some(_) = self.name.find("@") {
251+
if self.name.contains("@") {
252252
let pre_len = self
253253
.name
254254
.as_bytes()

src/de_mut/node_seq.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct NodeSeqItem<'de> {
2727
at: &'de str,
2828
}
2929

30-
impl<'de, 'b> Deserialize<'de> for NodeSeq<'b> {
30+
impl<'de> Deserialize<'de> for NodeSeq<'_> {
3131
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
3232
where
3333
D: serde::Deserializer<'de>,
@@ -75,7 +75,7 @@ impl<'de> NodeSeq<'de> {
7575
// 直接从指针拷贝
7676
let original_inner = unsafe { &*(ptr as *const GroupDeserializer<'_>) };
7777
let res = Self {
78-
inner: original_inner.clone(),
78+
inner: *original_inner,
7979
};
8080
// 初始化
8181
res.inner
@@ -127,7 +127,7 @@ impl Drop for NodeSeq<'_> {
127127
}
128128
}
129129

130-
impl<'de, 'b> Iterator for NodeSeqIter<'de, 'b> {
130+
impl<'de> Iterator for NodeSeqIter<'de, '_> {
131131
type Item = NodeSeqItem<'de>;
132132

133133
fn next(&mut self) -> Option<Self::Item> {

src/de_mut/reg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl RegConfig {
3535
};
3636
}
3737

38-
impl<'de, 'b> Deserialize<'de> for Reg<'b> {
38+
impl<'de> Deserialize<'de> for Reg<'_> {
3939
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
4040
where
4141
D: serde::Deserializer<'de>,

0 commit comments

Comments
 (0)