Skip to content

Commit 1e8cf13

Browse files
committed
clippy: fixes of Rust 2024 edition + upcoming nightly
1 parent 0da58fe commit 1e8cf13

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

multiboot2-header/examples/minimal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ fn main() {
3131
let ptr = mb2_hdr_bytes.as_bytes().as_ptr();
3232
let mb2_hdr = unsafe { Multiboot2Header::load(ptr.cast()) };
3333
let mb2_hdr = mb2_hdr.unwrap();
34-
println!("{:#?}", mb2_hdr);
34+
println!("{mb2_hdr:#?}");
3535
}

multiboot2-header/src/header.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use crate::{
44
HeaderTagType, InformationRequestHeaderTag, ModuleAlignHeaderTag, RelocatableHeaderTag,
55
TagIter,
66
};
7-
use core::error::Error;
87
use core::fmt::{Debug, Formatter};
98
use core::mem::size_of;
109
use core::ptr::NonNull;
@@ -38,7 +37,7 @@ impl<'a> Multiboot2Header<'a> {
3837
/// Multiboot2 header pointer.
3938
pub unsafe fn load(ptr: *const Multiboot2BasicHeader) -> Result<Self, LoadError> {
4039
let ptr = NonNull::new(ptr.cast_mut()).ok_or(LoadError::Memory(MemoryError::Null))?;
41-
let inner = DynSizedStructure::ref_from_ptr(ptr).map_err(LoadError::Memory)?;
40+
let inner = unsafe { DynSizedStructure::ref_from_ptr(ptr).map_err(LoadError::Memory)? };
4241
let this = Self(inner);
4342

4443
let header = this.0.header();

multiboot2/src/boot_information.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl<'a> BootInformation<'a> {
102102
/// program may observe unsynchronized mutation.
103103
pub unsafe fn load(ptr: *const BootInformationHeader) -> Result<Self, LoadError> {
104104
let ptr = NonNull::new(ptr.cast_mut()).ok_or(LoadError::Memory(MemoryError::Null))?;
105-
let inner = DynSizedStructure::ref_from_ptr(ptr).map_err(LoadError::Memory)?;
105+
let inner = unsafe { DynSizedStructure::ref_from_ptr(ptr).map_err(LoadError::Memory)? };
106106

107107
let this = Self(inner);
108108
if !this.has_valid_end_tag() {

multiboot2/src/elf_sections.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@ impl ElfSection<'_> {
315315
match self.entry_size {
316316
40 => unsafe { &*(self.inner as *const ElfSectionInner32) },
317317
64 => unsafe { &*(self.inner as *const ElfSectionInner64) },
318-
s => panic!("Unexpected entry size: {}", s),
318+
s => panic!("Unexpected entry size: {s}"),
319319
}
320320
}
321321

322322
unsafe fn string_table(&self) -> *const u8 {
323323
let addr = match self.entry_size {
324324
40 => (*(self.string_section as *const ElfSectionInner32)).addr as usize,
325325
64 => (*(self.string_section as *const ElfSectionInner64)).addr as usize,
326-
s => panic!("Unexpected entry size: {}", s),
326+
s => panic!("Unexpected entry size: {s}"),
327327
};
328328
addr as *const _
329329
}

multiboot2/src/tag_type.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ mod tests {
305305
set.insert(TagType::LoadBaseAddr);
306306
set.insert(TagType::LoadBaseAddr);
307307
assert_eq!(set.len(), 4);
308-
println!("{:#?}", set);
308+
println!("{set:#?}");
309309
}
310310

311311
#[test]
@@ -320,7 +320,7 @@ mod tests {
320320
for (current, next) in set.iter().zip(set.iter().skip(1)) {
321321
assert!(current < next);
322322
}
323-
println!("{:#?}", set);
323+
println!("{set:#?}");
324324
}
325325

326326
/// Tests for equality when one type is u32 and the other the enum representation.

0 commit comments

Comments
 (0)