Skip to content

Commit

Permalink
Unrolled build for rust-lang#127836
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127836 - workingjubilee:forbid-unsafe-ops-in-xous-uefi, r=tgross35

std: Forbid unwrapped unsafe ops in xous and uefi modules
  • Loading branch information
rust-timer committed Jul 17, 2024
2 parents 1a6e777 + 586ef83 commit d54aa42
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions library/std/src/os/uefi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#![unstable(feature = "uefi_std", issue = "100499")]
#![doc(cfg(target_os = "uefi"))]
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod env;
#[path = "../windows/ffi.rs"]
Expand Down
1 change: 1 addition & 0 deletions library/std/src/os/xous/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#![stable(feature = "rust1", since = "1.0.0")]
#![doc(cfg(target_os = "xous"))]
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod ffi;

Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/pal/uefi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//!
//! [`OsStr`]: crate::ffi::OsStr
//! [`OsString`]: crate::ffi::OsString
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod alloc;
pub mod args;
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/sys/pal/xous/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod alloc;
#[path = "../unsupported/args.rs"]
Expand Down

0 comments on commit d54aa42

Please sign in to comment.