Auto merge of #125000 - matthiaskrgr:rollup-cc9lc2y, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #124766 (std::rand: adding solaris/illumos for getrandom support.) - #124818 (Update ena to 0.14.3) - #124991 (Fix typo in ManuallyDrop's documentation) - #124994 (Add `@saethlin` to some triagebot groups) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
be7549f82c
5 changed files with 20 additions and 6 deletions
|
@ -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",
|
||||
]
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) }
|
||||
}
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
|
|
@ -933,11 +933,13 @@ arena = [
|
|||
mir = [
|
||||
"@davidtwco",
|
||||
"@oli-obk",
|
||||
"@matthewjasper"
|
||||
"@matthewjasper",
|
||||
"@saethlin",
|
||||
]
|
||||
mir-opt = [
|
||||
"@oli-obk",
|
||||
"@wesleywiser",
|
||||
"@saethlin",
|
||||
]
|
||||
types = [
|
||||
"@compiler-errors",
|
||||
|
@ -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"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue