Fixed references to static muts, removed stabilized features' gates.

sunfishcode · Feb 27, 2024 · 3464394 · 3464394
1 parent 9f49058
commit 3464394
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/c-scape/src/errno_.rs b/c-scape/src/errno_.rs
@@ -1,7 +1,7 @@
 use alloc::borrow::ToOwned;
 use alloc::format;
 use core::cell::SyncUnsafeCell;
-use core::ptr::{copy_nonoverlapping, null_mut};
+use core::ptr::{addr_of_mut, copy_nonoverlapping, null_mut};
 use libc::{c_char, c_int};
 
 /// Return the address of the thread-local `errno` state.
@@ -15,7 +15,7 @@ unsafe extern "C" fn __errno_location() -> *mut c_int {
 
     #[cfg_attr(feature = "thread", thread_local)]
     static mut ERRNO: i32 = 0;
-    &mut ERRNO
+    addr_of_mut!(ERRNO)
 }
 
 #[no_mangle]

diff --git a/c-scape/src/fs/xattr.rs b/c-scape/src/fs/xattr.rs
@@ -3,7 +3,7 @@
 use crate::{convert_res, READ_BUFFER};
 use core::cmp::min;
 use core::ffi::CStr;
-use core::ptr::copy_nonoverlapping;
+use core::ptr::{addr_of_mut, copy_nonoverlapping};
 use core::slice;
 use libc::{c_char, c_int, c_void, size_t, ssize_t};
 use rustix::fd::BorrowedFd;
@@ -26,7 +26,7 @@ unsafe extern "C" fn getxattr(
     match convert_res(rustix::fs::getxattr(
         path,
         name,
-        addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
+        &mut *addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
     )) {
         Some(size) => {
             // If `size` is 0, `value` could be null.
@@ -56,7 +56,7 @@ unsafe extern "C" fn lgetxattr(
     match convert_res(rustix::fs::lgetxattr(
         path,
         name,
-        addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
+        &mut *addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
     )) {
         Some(size) => {
             // If `size` is 0, `value` could be null.
@@ -86,7 +86,7 @@ unsafe extern "C" fn fgetxattr(
     match convert_res(rustix::fs::fgetxattr(
         fd,
         name,
-        addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
+        &mut *addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
     )) {
         Some(size) => {
             // If `size` is 0, `value` could be null.
@@ -169,7 +169,7 @@ unsafe extern "C" fn listxattr(path: *const c_char, list: *mut c_char, len: size
     // a slice, use a temporary copy.
     match convert_res(rustix::fs::listxattr(
         path,
-        addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
+        &mut *addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
     )) {
         Some(size) => {
             // If `size` is 0, `value` could be null.
@@ -192,7 +192,7 @@ unsafe extern "C" fn llistxattr(path: *const c_char, list: *mut c_char, len: siz
     // a slice, use a temporary copy.
     match convert_res(rustix::fs::llistxattr(
         path,
-        addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
+        &mut *addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
     )) {
         Some(size) => {
             // If `size` is 0, `value` could be null.
@@ -215,7 +215,7 @@ unsafe extern "C" fn flistxattr(fd: c_int, list: *mut c_char, len: size_t) -> ss
     // a slice, use a temporary copy.
     match convert_res(rustix::fs::flistxattr(
         fd,
-        addr_of_mut!([..min(len, READ_BUFFER.len())]),
+        &mut *addr_of_mut!(READ_BUFFER[..min(len, READ_BUFFER.len())]),
     )) {
         Some(size) => {
             // If `size` is 0, `value` could be null.

diff --git a/c-scape/src/lib.rs b/c-scape/src/lib.rs
@@ -7,7 +7,6 @@
 #![feature(exposed_provenance)]
 #![feature(inline_const)]
 #![feature(sync_unsafe_cell)]
-#![feature(ip_in_core)]
 #![feature(linkage)]
 #![deny(fuzzy_provenance_casts, lossy_provenance_casts)]
 

diff --git a/tests/example_crates.rs b/tests/example_crates.rs
@@ -1,7 +1,6 @@
 //! Run the programs in the `example-crates` directory and compare their
 //! outputs with expected outputs.
 
-#![feature(cfg_target_abi)]
 
 use std::sync::OnceLock;