Skip to content

Commit d4b83d8

Browse files
committed
Fix remaining clippy warnings
1 parent 58d783e commit d4b83d8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/addr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,15 +461,15 @@ mod tests {
461461
// align 1
462462
assert_eq!(align_up(0, 1), 0);
463463
assert_eq!(align_up(1234, 1), 1234);
464-
assert_eq!(align_up(0xffffffffffffffff, 1), 0xffffffffffffffff);
464+
assert_eq!(align_up(0xffff_ffff_ffff_ffff, 1), 0xffff_ffff_ffff_ffff);
465465
// align 2
466466
assert_eq!(align_up(0, 2), 0);
467467
assert_eq!(align_up(1233, 2), 1234);
468-
assert_eq!(align_up(0xfffffffffffffffe, 2), 0xfffffffffffffffe);
468+
assert_eq!(align_up(0xffff_ffff_ffff_fffe, 2), 0xffff_ffff_ffff_fffe);
469469
// address 0
470470
assert_eq!(align_up(0, 128), 0);
471471
assert_eq!(align_up(0, 1), 0);
472472
assert_eq!(align_up(0, 2), 0);
473-
assert_eq!(align_up(0, 0x8000000000000000), 0);
473+
assert_eq!(align_up(0, 0x8000_0000_0000_0000), 0);
474474
}
475475
}

src/structures/paging/mapper/mapped_page_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ impl<P: PhysToVirt> PageTableWalker<P> {
479479

480480
let page_table = match self.next_table_mut(entry) {
481481
Err(PageTableWalkError::MappedToHugePage) => {
482-
Err(PageTableCreateError::MappedToHugePage)?
482+
return Err(PageTableCreateError::MappedToHugePage);
483483
}
484484
Err(PageTableWalkError::NotMapped) => panic!("entry should be mapped at this point"),
485485
Ok(page_table) => page_table,

src/structures/paging/page.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,11 @@ mod tests {
339339
let page_size = Size4KiB::SIZE;
340340
let number = 1000;
341341

342-
let start_addr = VirtAddr::new(0xdeadbeaf);
342+
let start_addr = VirtAddr::new(0xdead_beaf);
343343
let start: Page = Page::containing_address(start_addr);
344-
let end = start.clone() + number;
344+
let end = start + number;
345345

346-
let mut range = Page::range(start.clone(), end.clone());
346+
let mut range = Page::range(start, end);
347347
for i in 0..number {
348348
assert_eq!(
349349
range.next(),

0 commit comments

Comments
 (0)