Skip to content

Commit

Permalink
Rollup merge of rust-lang#127873 - workingjubilee:forbid-unsafe-ops-f…
Browse files Browse the repository at this point in the history
…or-kmc-solid, r=Amanieu

kmc-solid: `#![forbid(unsafe_op_in_unsafe_fn)]`

The path logic _should_ handle the forbiddance in the itron sources correctly, despite them being an "out-of-line" module.
  • Loading branch information
tgross35 committed Jul 20, 2024
2 parents ff9ed81 + e9b3e9c commit fa28851
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 2 deletions.
1 change: 0 additions & 1 deletion library/std/src/os/solid/io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
//!
//! [`BorrowedFd<'a>`]: crate::os::solid::io::BorrowedFd

#![deny(unsafe_op_in_unsafe_fn)]
#![unstable(feature = "solid_ext", issue = "none")]

use crate::fmt;
Expand Down
1 change: 1 addition & 0 deletions library/std/src/os/solid/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![stable(feature = "rust1", since = "1.0.0")]
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod ffi;
pub mod io;
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/sys/pal/solid/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(dead_code)]
#![allow(missing_docs, nonstandard_style)]
#![deny(unsafe_op_in_unsafe_fn)]
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod abi;

Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/path/unsupported_backslash.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![forbid(unsafe_op_in_unsafe_fn)]
use crate::ffi::OsStr;
use crate::io;
use crate::path::{Path, PathBuf, Prefix};
Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/sync/mutex/itron.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! Mutex implementation backed by μITRON mutexes. Assumes `acre_mtx` and
//! `TA_INHERIT` are available.
#![forbid(unsafe_op_in_unsafe_fn)]

use crate::sys::pal::itron::{
abi,
Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/sync/rwlock/solid.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//! A readers-writer lock implementation backed by the SOLID kernel extension.
#![forbid(unsafe_op_in_unsafe_fn)]

use crate::sys::pal::{
abi,
Expand Down

0 comments on commit fa28851

Please sign in to comment.