Skip to content

Commit be7549f

Browse files
committed
Auto merge of rust-lang#125000 - matthiaskrgr:rollup-cc9lc2y, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang#124766 (std::rand: adding solaris/illumos for getrandom support.) - rust-lang#124818 (Update ena to 0.14.3) - rust-lang#124991 (Fix typo in ManuallyDrop's documentation) - rust-lang#124994 (Add `@saethlin` to some triagebot groups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ef15976 + a4317c4 commit be7549f

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

Diff for: Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1218,9 +1218,9 @@ dependencies = [
12181218

12191219
[[package]]
12201220
name = "ena"
1221-
version = "0.14.2"
1221+
version = "0.14.3"
12221222
source = "registry+https://github.com/rust-lang/crates.io-index"
1223-
checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
1223+
checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
12241224
dependencies = [
12251225
"log",
12261226
]

Diff for: compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ arrayvec = { version = "0.7", default-features = false }
99
bitflags = "2.4.1"
1010
either = "1.0"
1111
elsa = "=1.7.1"
12-
ena = "0.14.2"
12+
ena = "0.14.3"
1313
indexmap = { version = "2.0.0" }
1414
jobserver_crate = { version = "0.1.28", package = "jobserver" }
1515
libc = "0.2"

Diff for: library/core/src/mem/manually_drop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::ops::{Deref, DerefMut, DerefPure};
22
use crate::ptr;
33

4-
/// A wrapper to inhibit compiler from automatically calling `T`’s destructor.
4+
/// A wrapper to inhibit the compiler from automatically calling `T`’s destructor.
55
/// This wrapper is 0-cost.
66
///
77
/// `ManuallyDrop<T>` is guaranteed to have the same layout and bit validity as

Diff for: library/std/src/sys/pal/unix/rand.rs

+12-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,14 @@ mod imp {
5959
unsafe { getrandom(buf.as_mut_ptr().cast(), buf.len(), libc::GRND_NONBLOCK) }
6060
}
6161

62-
#[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "freebsd", netbsd10))]
62+
#[cfg(any(
63+
target_os = "espidf",
64+
target_os = "horizon",
65+
target_os = "freebsd",
66+
netbsd10,
67+
target_os = "illumos",
68+
target_os = "solaris"
69+
))]
6370
fn getrandom(buf: &mut [u8]) -> libc::ssize_t {
6471
unsafe { libc::getrandom(buf.as_mut_ptr().cast(), buf.len(), 0) }
6572
}
@@ -83,6 +90,8 @@ mod imp {
8390
target_os = "horizon",
8491
target_os = "freebsd",
8592
target_os = "dragonfly",
93+
target_os = "solaris",
94+
target_os = "illumos",
8695
netbsd10
8796
)))]
8897
fn getrandom_fill_bytes(_buf: &mut [u8]) -> bool {
@@ -96,6 +105,8 @@ mod imp {
96105
target_os = "horizon",
97106
target_os = "freebsd",
98107
target_os = "dragonfly",
108+
target_os = "solaris",
109+
target_os = "illumos",
99110
netbsd10
100111
))]
101112
fn getrandom_fill_bytes(v: &mut [u8]) -> bool {

Diff for: triagebot.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -933,11 +933,13 @@ arena = [
933933
mir = [
934934
"@davidtwco",
935935
"@oli-obk",
936-
"@matthewjasper"
936+
"@matthewjasper",
937+
"@saethlin",
937938
]
938939
mir-opt = [
939940
"@oli-obk",
940941
"@wesleywiser",
942+
"@saethlin",
941943
]
942944
types = [
943945
"@compiler-errors",
@@ -1003,6 +1005,7 @@ project-exploit-mitigations = [
10031005
"/compiler/rustc_lexer" = ["compiler", "lexer"]
10041006
"/compiler/rustc_llvm" = ["@cuviper"]
10051007
"/compiler/rustc_codegen_llvm/src/debuginfo" = ["compiler", "debuginfo"]
1008+
"/compiler/rustc_codegen_ssa" = ["compiler", "@saethlin"]
10061009
"/compiler/rustc_middle/src/mir" = ["compiler", "mir"]
10071010
"/compiler/rustc_middle/src/traits" = ["compiler", "types"]
10081011
"/compiler/rustc_middle/src/ty" = ["compiler", "types"]

0 commit comments

Comments
 (0)