Skip to content

Rollup of 4 pull requests #125000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 11, 2024
Merged

Rollup of 4 pull requests #125000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d45f47
std::rand: adding solaris/illumos for getrandom support.
devnexen May 5, 2024
2af0871
Update ena to 0.14.3
compiler-errors May 6, 2024
781d737
Fix typo in ManuallyDrop's documentation
Infinixius May 10, 2024
e6f961c
Add @saethlin to some triagebot groups
saethlin May 11, 2024
f73f266
Rollup merge of #124766 - devnexen:getrandom_solarish, r=Mark-Simulacrum
matthiaskrgr May 11, 2024
3c40e38
Rollup merge of #124818 - compiler-errors:ena, r=Mark-Simulacrum
matthiaskrgr May 11, 2024
0997891
Rollup merge of #124991 - Infinixius:patch-1, r=Nilstrieb
matthiaskrgr May 11, 2024
a4317c4
Rollup merge of #124994 - saethlin:saethlin-triagebot, r=scottmcm
matthiaskrgr May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,9 +1218,9 @@ dependencies = [

[[package]]
name = "ena"
version = "0.14.2"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
dependencies = [
"log",
]
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ arrayvec = { version = "0.7", default-features = false }
bitflags = "2.4.1"
either = "1.0"
elsa = "=1.7.1"
ena = "0.14.2"
ena = "0.14.3"
indexmap = { version = "2.0.0" }
jobserver_crate = { version = "0.1.28", package = "jobserver" }
libc = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/mem/manually_drop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::ops::{Deref, DerefMut, DerefPure};
use crate::ptr;

/// A wrapper to inhibit compiler from automatically calling `T`’s destructor.
/// A wrapper to inhibit the compiler from automatically calling `T`’s destructor.
/// This wrapper is 0-cost.
///
/// `ManuallyDrop<T>` is guaranteed to have the same layout and bit validity as
Expand Down
13 changes: 12 additions & 1 deletion library/std/src/sys/pal/unix/rand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,14 @@ mod imp {
unsafe { getrandom(buf.as_mut_ptr().cast(), buf.len(), libc::GRND_NONBLOCK) }
}

#[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "freebsd", netbsd10))]
#[cfg(any(
target_os = "espidf",
target_os = "horizon",
target_os = "freebsd",
netbsd10,
target_os = "illumos",
target_os = "solaris"
))]
fn getrandom(buf: &mut [u8]) -> libc::ssize_t {
unsafe { libc::getrandom(buf.as_mut_ptr().cast(), buf.len(), 0) }
}
Expand All @@ -83,6 +90,8 @@ mod imp {
target_os = "horizon",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "solaris",
target_os = "illumos",
netbsd10
)))]
fn getrandom_fill_bytes(_buf: &mut [u8]) -> bool {
Expand All @@ -96,6 +105,8 @@ mod imp {
target_os = "horizon",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "solaris",
target_os = "illumos",
netbsd10
))]
fn getrandom_fill_bytes(v: &mut [u8]) -> bool {
Expand Down
5 changes: 4 additions & 1 deletion triagebot.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,11 +933,13 @@ arena = [
mir = [
"@davidtwco",
"@oli-obk",
"@matthewjasper"
"@matthewjasper",
"@saethlin",
]
mir-opt = [
"@oli-obk",
"@wesleywiser",
"@saethlin",
]
types = [
"@compiler-errors",
Expand Down Expand Up @@ -1003,6 +1005,7 @@ project-exploit-mitigations = [
"/compiler/rustc_lexer" = ["compiler", "lexer"]
"/compiler/rustc_llvm" = ["@cuviper"]
"/compiler/rustc_codegen_llvm/src/debuginfo" = ["compiler", "debuginfo"]
"/compiler/rustc_codegen_ssa" = ["compiler", "@saethlin"]
"/compiler/rustc_middle/src/mir" = ["compiler", "mir"]
"/compiler/rustc_middle/src/traits" = ["compiler", "types"]
"/compiler/rustc_middle/src/ty" = ["compiler", "types"]
Expand Down