trivial: Update rust, deps, fix lints.

Signed-off-by: Dan Cross <[email protected]>
r9os · Oct 15, 2024 · 0cda5c2 · 0cda5c2
1 parent 79e0160
commit 0cda5c2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/port/src/mcslock.rs b/port/src/mcslock.rs
@@ -105,21 +105,21 @@ pub struct LockGuard<'a, T: ?Sized + 'a> {
     node: &'a LockNode,
     data: &'a mut T,
 }
-impl<'a, T> Deref for LockGuard<'a, T> {
+impl<T> Deref for LockGuard<'_, T> {
     type Target = T;
 
     fn deref(&self) -> &T {
         self.data
     }
 }
 
-impl<'a, T> DerefMut for LockGuard<'a, T> {
+impl<T> DerefMut for LockGuard<'_, T> {
     fn deref_mut(&mut self) -> &mut T {
         self.data
     }
 }
 
-impl<'a, T: ?Sized> Drop for LockGuard<'a, T> {
+impl<T: ?Sized> Drop for LockGuard<'_, T> {
     fn drop(&mut self) {
         unsafe { &mut *self.lock.get() }.unlock(self.node);
     }

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-09-27"
+channel = "nightly-2024-10-15"
 components = [ "rustfmt", "rust-src", "clippy", "llvm-tools" ]
 targets = [
   "aarch64-unknown-none",

diff --git a/x86_64/src/proc.rs b/x86_64/src/proc.rs
@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::naked_asm;
 
 #[repr(C)]
 pub struct Label {
@@ -21,7 +21,7 @@ impl Label {
 #[naked]
 pub unsafe extern "C" fn swtch(save: &mut Label, next: &mut Label) {
     unsafe {
-        asm!(
+        naked_asm!(
             r#"
             movq (%rsp), %rax
             movq %rax, 0(%rdi)
@@ -44,7 +44,7 @@ pub unsafe extern "C" fn swtch(save: &mut Label, next: &mut Label) {
             movq %rax, (%rsp)
             xorl %eax, %eax
             ret"#,
-            options(att_syntax, noreturn)
+            options(att_syntax)
         );
     }
 }