Skip to content

Commit 876e3f6

Browse files
committed
mem: Remove mut in MemoryRegion::from_bytes
This change is suggested by clippy. Signed-off-by: Akira Moroo <retrage01@gmail.com>
1 parent af0d3c7 commit 876e3f6

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/boot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ pub struct Header {
191191
impl Header {
192192
// Read a kernel header from the first two sectors of a file
193193
pub fn from_file(f: &mut dyn Read) -> Result<Self, Error> {
194-
let mut data: [u8; 1024] = [0; 1024];
195-
let mut region = MemoryRegion::from_bytes(&mut data);
194+
let data: [u8; 1024] = [0; 1024];
195+
let mut region = MemoryRegion::from_bytes(&data);
196196

197197
f.seek(0)?;
198198
f.load_file(&mut region)?;

src/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl MemoryRegion {
1616
}
1717

1818
/// Take a slice and turn it into a region of memory
19-
pub fn from_bytes(data: &mut [u8]) -> MemoryRegion {
19+
pub fn from_bytes(data: &[u8]) -> MemoryRegion {
2020
MemoryRegion {
2121
base: data.as_ptr() as u64,
2222
length: data.len() as u64,

src/pe.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl<'a> Loader<'a> {
7878
return Err(Error::FileError);
7979
}
8080

81-
let dos_region = MemoryRegion::from_bytes(&mut data);
81+
let dos_region = MemoryRegion::from_bytes(&data);
8282

8383
// 'MZ' magic
8484
if dos_region.read_u16(0) != 0x5a4d {
@@ -92,7 +92,7 @@ impl<'a> Loader<'a> {
9292
return Err(Error::InvalidExecutable);
9393
}
9494

95-
let pe_region = MemoryRegion::from_bytes(&mut data[pe_header_offset as usize..]);
95+
let pe_region = MemoryRegion::from_bytes(&data[pe_header_offset as usize..]);
9696

9797
// The Microsoft specification uses offsets relative to the COFF area
9898
// which is 4 after the signature (so all offsets are +4 relative to the spec)
@@ -109,8 +109,7 @@ impl<'a> Loader<'a> {
109109
self.num_sections = pe_region.read_u16(6);
110110

111111
let optional_header_size = pe_region.read_u16(20);
112-
let optional_region =
113-
MemoryRegion::from_bytes(&mut data[(24 + pe_header_offset) as usize..]);
112+
let optional_region = MemoryRegion::from_bytes(&data[(24 + pe_header_offset) as usize..]);
114113

115114
if optional_region.read_u16(0) != Self::OPTIONAL_HEADER_MAGIC {
116115
return Err(Error::InvalidExecutable);

0 commit comments

Comments
 (0)