Skip to content

Commit d576106

Browse files
committed
refactor(kernel): address the clippy::extra_unused_type_parameters lint in bad_id
1 parent 77eee26 commit d576106

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

src/r3_kernel/src/event_group.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ impl<Traits: KernelTraits> System<Traits> {
2828
unsafe fn event_group_cb(
2929
this: EventGroupId,
3030
) -> Result<&'static EventGroupCb<Traits>, NoAccessError> {
31-
Traits::get_event_group_cb(this.get() - 1)
32-
.ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
31+
Traits::get_event_group_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
3332
}
3433
}
3534

src/r3_kernel/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ impl<Traits: KernelCfg2> State<Traits> {
973973
///
974974
/// [object safety]: r3_core#object-safety
975975
#[inline]
976-
unsafe fn bad_id<Traits: KernelCfg2>() -> error::NoAccessError {
976+
unsafe fn bad_id() -> error::NoAccessError {
977977
// TODO: Support returning `NoAccess`
978978
let _ = error::NoAccessError::NoAccess;
979979
if cfg!(debug_assertion) {

src/r3_kernel/src/mutex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl<Traits: KernelTraits> System<Traits> {
2626
/// See [`crate::bad_id`].
2727
#[inline]
2828
unsafe fn mutex_cb(this: MutexId) -> Result<&'static MutexCb<Traits>, NoAccessError> {
29-
Traits::get_mutex_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
29+
Traits::get_mutex_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
3030
}
3131
}
3232

src/r3_kernel/src/semaphore.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<Traits: KernelTraits> System<Traits> {
2828
unsafe fn semaphore_cb(
2929
this: SemaphoreId,
3030
) -> Result<&'static SemaphoreCb<Traits>, NoAccessError> {
31-
Traits::get_semaphore_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
31+
Traits::get_semaphore_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
3232
}
3333
}
3434

src/r3_kernel/src/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl<Traits: KernelTraits> System<Traits> {
3535
/// See [`crate::bad_id`].
3636
#[inline]
3737
unsafe fn task_cb(this: TaskId) -> Result<&'static TaskCb<Traits>, NoAccessError> {
38-
Traits::get_task_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
38+
Traits::get_task_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
3939
}
4040

4141
#[cfg_attr(not(feature = "inline_syscall"), inline(never))]

src/r3_kernel/src/timer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl<Traits: KernelTraits> System<Traits> {
2525
/// See [`crate::bad_id`].
2626
#[inline]
2727
unsafe fn timer_cb(this: TimerId) -> Result<&'static TimerCb<Traits>, NoAccessError> {
28-
Traits::get_timer_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
28+
Traits::get_timer_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
2929
}
3030
}
3131

0 commit comments

Comments
 (0)