about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/sys/env/mod.rs2
-rw-r--r--library/std/src/sys/env/unix.rs8
2 files changed, 4 insertions, 6 deletions
diff --git a/library/std/src/sys/env/mod.rs b/library/std/src/sys/env/mod.rs
index bfd3e7fe8be..0ae7ef53add 100644
--- a/library/std/src/sys/env/mod.rs
+++ b/library/std/src/sys/env/mod.rs
@@ -1,6 +1,6 @@
 //! Platform-dependent environment variables abstraction.
 
-#![deny(unsafe_op_in_unsafe_fn)]
+#![forbid(unsafe_op_in_unsafe_fn)]
 
 cfg_if::cfg_if! {
     if #[cfg(target_family = "unix")] {
diff --git a/library/std/src/sys/env/unix.rs b/library/std/src/sys/env/unix.rs
index 906a9b40112..73aacfcad3b 100644
--- a/library/std/src/sys/env/unix.rs
+++ b/library/std/src/sys/env/unix.rs
@@ -1,5 +1,3 @@
-#![allow(unsafe_op_in_unsafe_fn)]
-
 use core::slice::memchr;
 
 use libc::c_char;
@@ -81,7 +79,7 @@ impl Iterator for Env {
 // desirable anyhow? Though it also means that we have to link to Foundation.
 #[cfg(target_vendor = "apple")]
 pub unsafe fn environ() -> *mut *const *const c_char {
-    libc::_NSGetEnviron() as *mut *const *const c_char
+    unsafe { libc::_NSGetEnviron() as *mut *const *const c_char }
 }
 
 // Use the `environ` static which is part of POSIX.
@@ -159,7 +157,7 @@ pub unsafe fn setenv(k: &OsStr, v: &OsStr) -> io::Result<()> {
     run_with_cstr(k.as_bytes(), &|k| {
         run_with_cstr(v.as_bytes(), &|v| {
             let _guard = ENV_LOCK.write();
-            cvt(libc::setenv(k.as_ptr(), v.as_ptr(), 1)).map(drop)
+            cvt(unsafe { libc::setenv(k.as_ptr(), v.as_ptr(), 1) }).map(drop)
         })
     })
 }
@@ -167,6 +165,6 @@ pub unsafe fn setenv(k: &OsStr, v: &OsStr) -> io::Result<()> {
 pub unsafe fn unsetenv(n: &OsStr) -> io::Result<()> {
     run_with_cstr(n.as_bytes(), &|nbuf| {
         let _guard = ENV_LOCK.write();
-        cvt(libc::unsetenv(nbuf.as_ptr())).map(drop)
+        cvt(unsafe { libc::unsetenv(nbuf.as_ptr()) }).map(drop)
     })
 }