Skip to content

Commit f6eb32a

Browse files
committed
refactor(test_suite): address the clippy::extra_unused_type_parameters lint
1 parent 093c56a commit f6eb32a

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

src/r3_test_suite/src/kernel_tests/task_cpu_lock_reset.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl<System: SupportedSystem> App<System> {
2121
.active(true)
2222
.finish(b);
2323
let task2 = StaticTask::define()
24-
.start(task2_body::<System, D>)
24+
.start(task2_body::<System>)
2525
.priority(1)
2626
.finish(b);
2727

@@ -36,7 +36,7 @@ fn task1_body<System: SupportedSystem, D: Driver<App<System>>>() {
3636
D::success();
3737
}
3838

39-
fn task2_body<System: SupportedSystem, D: Driver<App<System>>>() {
39+
fn task2_body<System: SupportedSystem>() {
4040
// Acquire CPU Lock This should succeed in both runs because
4141
// it's automatically released on each run.
4242
System::acquire_cpu_lock().unwrap();

src/r3_test_suite/src/kernel_tests/task_misc.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@ impl<System: SupportedSystem> App<System> {
2020
C: ~const traits::CfgTask<System = System>,
2121
{
2222
StartupHook::define()
23-
.start(startup_hook::<System, D>)
23+
.start(startup_hook::<System>)
2424
.finish(b);
2525

2626
let task1 = StaticTask::define()
2727
.start((42, task1_body::<System, D>))
2828
.priority(2)
2929
.active(true)
3030
.finish(b);
31-
let task2 = StaticTask::define()
32-
.start(task2_body::<System, D>)
33-
.priority(1)
34-
.finish(b);
31+
let task2 = StaticTask::define().start(task2_body).priority(1).finish(b);
3532
let task3 = StaticTask::define()
3633
.start(task3_body::<System, D>)
3734
.priority(1)
@@ -45,7 +42,7 @@ impl<System: SupportedSystem> App<System> {
4542
}
4643
}
4744

48-
fn startup_hook<System: SupportedSystem, D: Driver<App<System>>>() {
45+
fn startup_hook<System: SupportedSystem>() {
4946
assert_eq!(
5047
LocalTask::<System>::current(),
5148
Err(r3::kernel::GetCurrentTaskError::BadContext)
@@ -164,7 +161,7 @@ fn task1_body<System: SupportedSystem, D: Driver<App<System>, System = System>>(
164161
app.task3.activate().unwrap();
165162
}
166163

167-
fn task2_body<System: SupportedSystem, D: Driver<App<System>>>() {
164+
fn task2_body() {
168165
unreachable!();
169166
}
170167

src/r3_test_suite/src/kernel_tests/task_priority_boost_reset.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl<System: SupportedSystem> App<System> {
2222
.active(true)
2323
.finish(b);
2424
let task2 = StaticTask::define()
25-
.start(task2_body::<System, D>)
25+
.start(task2_body::<System>)
2626
.priority(1)
2727
.finish(b);
2828

@@ -37,7 +37,7 @@ fn task1_body<System: SupportedSystem, D: Driver<App<System>>>() {
3737
D::success();
3838
}
3939

40-
fn task2_body<System: SupportedSystem, D: Driver<App<System>>>() {
40+
fn task2_body<System: SupportedSystem>() {
4141
// Activate Priority Boost. This should succeed in both runs because
4242
// it's automatically deactivated on each run.
4343
if let Some(cap) = System::BOOST_PRIORITY_CAPABILITY {

src/r3_test_suite/src/kernel_tests/time_misc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl<System: SupportedSystem> App<System> {
2222
C: ~const traits::CfgTask<System = System>,
2323
{
2424
StartupHook::define()
25-
.start(startup_hook::<System, D>)
25+
.start(startup_hook::<System>)
2626
.finish(b);
2727
StaticTask::define()
2828
.start(task_body::<System, D>)
@@ -36,7 +36,7 @@ impl<System: SupportedSystem> App<System> {
3636
}
3737
}
3838

39-
fn startup_hook<System: SupportedSystem, D: Driver<App<System>>>() {
39+
fn startup_hook<System: SupportedSystem>() {
4040
// Not a task context
4141
if let Some(cap) = System::TIME_CAPABILITY {
4242
assert_eq!(System::time(cap), Err(r3::kernel::TimeError::BadContext));

src/r3_test_suite/src/kernel_tests/timer_misc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ impl<System: SupportedSystem> App<System> {
5858

5959
let timer3 = StaticTimer::define()
6060
.period(Duration::from_millis(0))
61-
.start(unreachable_timer_body::<System, D>)
61+
.start(unreachable_timer_body)
6262
.finish(b);
6363

6464
let timer4 = StaticTimer::define()
6565
.delay(Duration::from_millis(0))
6666
.period(Duration::from_millis(0))
67-
.start(unreachable_timer_body::<System, D>)
67+
.start(unreachable_timer_body)
6868
.finish(b);
6969

7070
let task = StaticTask::define()
@@ -235,6 +235,6 @@ fn timer2_body<System: SupportedSystem, D: Driver<App<System>>>(param: usize) {
235235
task.unpark().unwrap();
236236
}
237237

238-
fn unreachable_timer_body<System: SupportedSystem, D: Driver<App<System>>>() {
238+
fn unreachable_timer_body() {
239239
unreachable!()
240240
}

0 commit comments

Comments
 (0)