Skip to content

Commit 1c1cc91

Browse files
committed
fixup: riscv-peripheral: clippy fixes
1 parent 81dfb00 commit 1c1cc91

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

riscv-peripheral/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
- `clippy` fixes
13+
1014
## [v0.2.1] - 2025-02-18
1115

1216
### Changed

riscv-peripheral/src/aclint/mswi.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,23 @@ mod test {
8080
#[test]
8181
fn test_mswi() {
8282
// slice to emulate the interrupt pendings register
83-
let raw_reg = [0u32; HartId::MAX_HART_ID_NUMBER as usize + 1];
83+
let raw_reg = [0u32; HartId::MAX_HART_ID_NUMBER + 1];
8484
// SAFETY: valid memory address
8585
let mswi = unsafe { MSWI::new(raw_reg.as_ptr() as _) };
8686

87-
for i in 0..=HartId::MAX_HART_ID_NUMBER {
88-
let hart_id = HartId::from_number(i).unwrap();
87+
for (i, hart_id) in (0..raw_reg.len())
88+
.map(|i| HartId::from_number(i).unwrap())
89+
.enumerate()
90+
{
8991
let msip = mswi.msip(hart_id);
9092
assert!(!msip.is_pending());
91-
assert_eq!(raw_reg[i as usize], 0);
93+
assert_eq!(raw_reg[i], 0);
9294
msip.pend();
9395
assert!(msip.is_pending());
94-
assert_ne!(raw_reg[i as usize], 0);
96+
assert_ne!(raw_reg[i], 0);
9597
msip.unpend();
9698
assert!(!msip.is_pending());
97-
assert_eq!(raw_reg[i as usize], 0);
99+
assert_eq!(raw_reg[i], 0);
98100
}
99101
}
100102
}

riscv-peripheral/src/aclint/mtimer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mod test {
6666
#[test]
6767
fn check_mtimer() {
6868
// slice to emulate the mtimecmp registers
69-
let raw_mtimecmp = [0u64; HartId::MAX_HART_ID_NUMBER as usize + 1];
69+
let raw_mtimecmp = [0u64; HartId::MAX_HART_ID_NUMBER + 1];
7070
let raw_mtime = 0u64;
7171
// SAFETY: valid memory addresses
7272
let mtimer =

riscv-peripheral/src/aclint/sswi.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,23 @@ mod test {
9898
#[test]
9999
fn test_sswi() {
100100
// slice to emulate the interrupt pendings register
101-
let raw_reg = [0u32; HartId::MAX_HART_ID_NUMBER as usize + 1];
101+
let raw_reg = [0u32; HartId::MAX_HART_ID_NUMBER + 1];
102102
// SAFETY: valid memory address
103103
let mswi = unsafe { SSWI::new(raw_reg.as_ptr() as _) };
104104

105-
for i in 0..=HartId::MAX_HART_ID_NUMBER {
106-
let hart_id = HartId::from_number(i).unwrap();
105+
for (i, hart_id) in (0..raw_reg.len())
106+
.map(|i| HartId::from_number(i).unwrap())
107+
.enumerate()
108+
{
107109
let setssip = mswi.setssip(hart_id);
108110
assert!(!setssip.is_pending());
109-
assert_eq!(raw_reg[i as usize], 0);
111+
assert_eq!(raw_reg[i], 0);
110112
setssip.pend();
111113
assert!(setssip.is_pending());
112-
assert_ne!(raw_reg[i as usize], 0);
114+
assert_ne!(raw_reg[i], 0);
113115
setssip.unpend();
114116
assert!(!setssip.is_pending());
115-
assert_eq!(raw_reg[i as usize], 0);
117+
assert_eq!(raw_reg[i], 0);
116118
}
117119
}
118120
}

riscv-peripheral/src/plic.rs

-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ pub(crate) mod test {
292292

293293
for i in 0..=Context::MAX_HART_ID_NUMBER {
294294
let context = Context::from_number(i).unwrap();
295-
let i = i as usize;
296295

297296
let ctx = PLIC::ctx(context);
298297

0 commit comments

Comments
 (0)