bugfix: Fix new warnings on nightly

static mut is now discouraged; however it appears that the places we use
static mut can be removed pretty easily.

Signed-off-by: John Nunley <[email protected]>

src/backend/linux_raw/vdso_wrappers.rs

@@ -317,17 +317,17 @@ fn init_syscall() -> SyscallType {
 /// placeholder type, and cast it as needed.
 struct Function;
 #[cfg(feature = "time")]
-static mut CLOCK_GETTIME: AtomicPtr<Function> = AtomicPtr::new(null_mut());
+static CLOCK_GETTIME: AtomicPtr<Function> = AtomicPtr::new(null_mut());
 #[cfg(feature = "process")]
 #[cfg(any(
  target_arch = "x86_64",
  target_arch = "x86",
  target_arch = "riscv64",
  target_arch = "powerpc64"
 ))]
-static mut GETCPU: AtomicPtr<Function> = AtomicPtr::new(null_mut());
+static GETCPU: AtomicPtr<Function> = AtomicPtr::new(null_mut());
 #[cfg(target_arch = "x86")]
-static mut SYSCALL: AtomicPtr<Function> = AtomicPtr::new(null_mut());
+static SYSCALL: AtomicPtr<Function> = AtomicPtr::new(null_mut());
 
 #[cfg(feature = "time")]
 unsafe extern "C" fn rustix_clock_gettime_via_syscall(
@@ -438,48 +438,46 @@ fn minimal_init() {
  // end up making any system calls while we read the vDSO, they'll work. If
  // the memory happens to already be initialized, this is redundant, but not
  // harmful.
- unsafe {
- #[cfg(feature = "time")]
- {
- CLOCK_GETTIME
- .compare_exchange(
- null_mut(),
- rustix_clock_gettime_via_syscall as *mut Function,
- Relaxed,
- Relaxed,
- )
- .ok();
- }
+ #[cfg(feature = "time")]
+ {
+ CLOCK_GETTIME
+ .compare_exchange(
+ null_mut(),
+ rustix_clock_gettime_via_syscall as *mut Function,
+ Relaxed,
+ Relaxed,
+ )
+ .ok();
+ }
 
-  #[cfg(feature = "process")]
-  #[cfg(any(
-  target_arch = "x86_64",
-  target_arch = "x86",
-  target_arch = "riscv64",
-  target_arch = "powerpc64"
-  ))]
-  {
-  GETCPU
-  .compare_exchange(
-  null_mut(),
-  rustix_getcpu_via_syscall as *mut Function,
-  Relaxed,
-  Relaxed,
-  )
-  .ok();
-  }
+ #[cfg(feature = "process")]
+ #[cfg(any(
+ target_arch = "x86_64",
+ target_arch = "x86",
+ target_arch = "riscv64",
+ target_arch = "powerpc64"
+ ))]
+ {
+ GETCPU
+ .compare_exchange(
+ null_mut(),
+ rustix_getcpu_via_syscall as *mut Function,
+ Relaxed,
+ Relaxed,
+ )
+ .ok();
+ }
 
- #[cfg(target_arch = "x86")]
- {
- SYSCALL
- .compare_exchange(
- null_mut(),
- rustix_int_0x80 as *mut Function,
- Relaxed,
- Relaxed,
- )
- .ok();
- }
+ #[cfg(target_arch = "x86")]
+ {
+ SYSCALL
+ .compare_exchange(
+ null_mut(),
+ rustix_int_0x80 as *mut Function,
+ Relaxed,
+ Relaxed,
+ )
+ .ok();
  }
 }
 
@@ -532,9 +530,7 @@ fn init() {
  // SAFETY: Store the computed function addresses in static
  // storage so that we don't need to compute it again (but if
  // we do, it doesn't hurt anything).
- unsafe {
- CLOCK_GETTIME.store(ptr.cast(), Relaxed);
- }
+ CLOCK_GETTIME.store(ptr.cast(), Relaxed);
  }
  }
 
@@ -586,9 +582,7 @@ fn init() {
  // SAFETY: Store the computed function addresses in static
  // storage so that we don't need to compute it again (but if
  // we do, it doesn't hurt anything).
- unsafe {
- GETCPU.store(ptr.cast(), Relaxed);
- }
+ GETCPU.store(ptr.cast(), Relaxed);
  }
  }