refactor(kernel): address the clippy::extra_unused_type_parameters …

…lint in `bad_id`
r3-os · Mar 21, 2023 · d576106 · d576106
1 parent 77eee26
commit d576106
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/src/r3_kernel/src/event_group.rs b/src/r3_kernel/src/event_group.rs
@@ -28,8 +28,7 @@ impl<Traits: KernelTraits> System<Traits> {
     unsafe fn event_group_cb(
         this: EventGroupId,
     ) -> Result<&'static EventGroupCb<Traits>, NoAccessError> {
-        Traits::get_event_group_cb(this.get() - 1)
-            .ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
+        Traits::get_event_group_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
     }
 }
 

diff --git a/src/r3_kernel/src/lib.rs b/src/r3_kernel/src/lib.rs
@@ -973,7 +973,7 @@ impl<Traits: KernelCfg2> State<Traits> {
 ///
 /// [object safety]: r3_core#object-safety
 #[inline]
-unsafe fn bad_id<Traits: KernelCfg2>() -> error::NoAccessError {
+unsafe fn bad_id() -> error::NoAccessError {
     // TODO: Support returning `NoAccess`
     let _ = error::NoAccessError::NoAccess;
     if cfg!(debug_assertion) {

diff --git a/src/r3_kernel/src/mutex.rs b/src/r3_kernel/src/mutex.rs
@@ -26,7 +26,7 @@ impl<Traits: KernelTraits> System<Traits> {
     /// See [`crate::bad_id`].
     #[inline]
     unsafe fn mutex_cb(this: MutexId) -> Result<&'static MutexCb<Traits>, NoAccessError> {
-        Traits::get_mutex_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
+        Traits::get_mutex_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
     }
 }
 

diff --git a/src/r3_kernel/src/semaphore.rs b/src/r3_kernel/src/semaphore.rs
@@ -28,7 +28,7 @@ impl<Traits: KernelTraits> System<Traits> {
     unsafe fn semaphore_cb(
         this: SemaphoreId,
     ) -> Result<&'static SemaphoreCb<Traits>, NoAccessError> {
-        Traits::get_semaphore_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
+        Traits::get_semaphore_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
     }
 }
 

diff --git a/src/r3_kernel/src/task.rs b/src/r3_kernel/src/task.rs
@@ -35,7 +35,7 @@ impl<Traits: KernelTraits> System<Traits> {
     /// See [`crate::bad_id`].
     #[inline]
     unsafe fn task_cb(this: TaskId) -> Result<&'static TaskCb<Traits>, NoAccessError> {
-        Traits::get_task_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
+        Traits::get_task_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
     }
 
     #[cfg_attr(not(feature = "inline_syscall"), inline(never))]

diff --git a/src/r3_kernel/src/timer.rs b/src/r3_kernel/src/timer.rs
@@ -25,7 +25,7 @@ impl<Traits: KernelTraits> System<Traits> {
     /// See [`crate::bad_id`].
     #[inline]
     unsafe fn timer_cb(this: TimerId) -> Result<&'static TimerCb<Traits>, NoAccessError> {
-        Traits::get_timer_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
+        Traits::get_timer_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
     }
 }