Skip to content

Commit 2da7b7f

Browse files
borsbors
committed
Auto merge of rust-lang#132121 - workingjubilee:rollup-yrtn33e, r=workingjubilee
Rollup of 6 pull requests Successful merges: - rust-lang#131851 ([musl] use posix_spawn if a directory change was requested) - rust-lang#132048 (AIX: use /dev/urandom for random implementation ) - rust-lang#132093 (compiletest: suppress Windows Error Reporting (WER) for `run-make` tests) - rust-lang#132101 (Avoid using imports in thread_local_inner! in static) - rust-lang#132113 (Provide a default impl for Pattern::as_utf8_pattern) - rust-lang#132115 (rustdoc: Extend fake_variadic to "wrapped" tuples) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b4ea08d + 5cf142b commit 2da7b7f

File tree

6 files changed

+66
-28
lines changed

6 files changed

+66
-28
lines changed

‎core/src/str/pattern.rs

+3-11
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ pub trait Pattern: Sized {
162162
}
163163

164164
/// Returns the pattern as utf-8 bytes if possible.
165-
fn as_utf8_pattern(&self) -> Option<Utf8Pattern<'_>>;
165+
fn as_utf8_pattern(&self) -> Option<Utf8Pattern<'_>> {
166+
None
167+
}
166168
}
167169
/// Result of calling [`Pattern::as_utf8_pattern()`].
168170
/// Can be used for inspecting the contents of a [`Pattern`] in cases
@@ -675,11 +677,6 @@ impl<C: MultiCharEq> Pattern for MultiCharEqPattern<C> {
675677
fn into_searcher(self, haystack: &str) -> MultiCharEqSearcher<'_, C> {
676678
MultiCharEqSearcher { haystack, char_eq: self.0, char_indices: haystack.char_indices() }
677679
}
678-
679-
#[inline]
680-
fn as_utf8_pattern(&self) -> Option<Utf8Pattern<'_>> {
681-
None
682-
}
683680
}
684681

685682
unsafe impl<'a, C: MultiCharEq> Searcher<'a> for MultiCharEqSearcher<'a, C> {
@@ -770,11 +767,6 @@ macro_rules! pattern_methods {
770767
{
771768
($pmap)(self).strip_suffix_of(haystack)
772769
}
773-
774-
#[inline]
775-
fn as_utf8_pattern(&self) -> Option<Utf8Pattern<'_>> {
776-
None
777-
}
778770
};
779771
}
780772

‎std/src/process/tests.rs

+14
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,23 @@ fn stdout_works() {
9696
#[test]
9797
#[cfg_attr(any(windows, target_os = "vxworks"), ignore)]
9898
fn set_current_dir_works() {
99+
// On many Unix platforms this will use the posix_spawn path.
99100
let mut cmd = shell_cmd();
100101
cmd.arg("-c").arg("pwd").current_dir("/").stdout(Stdio::piped());
101102
assert_eq!(run_output(cmd), "/\n");
103+
104+
// Also test the fork/exec path by setting a pre_exec function.
105+
#[cfg(unix)]
106+
{
107+
use crate::os::unix::process::CommandExt;
108+
109+
let mut cmd = shell_cmd();
110+
cmd.arg("-c").arg("pwd").current_dir("/").stdout(Stdio::piped());
111+
unsafe {
112+
cmd.pre_exec(|| Ok(()));
113+
}
114+
assert_eq!(run_output(cmd), "/\n");
115+
}
102116
}
103117

104118
#[test]

‎std/src/random.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use crate::sys::random as sys;
3838
/// Vita | `arc4random_buf`
3939
/// Hermit | `read_entropy`
4040
/// Horizon | `getrandom` shim
41-
/// Hurd, L4Re, QNX | `/dev/urandom`
41+
/// AIX, Hurd, L4Re, QNX | `/dev/urandom`
4242
/// Redox | `/scheme/rand`
4343
/// RTEMS | [`arc4random_buf`](https://docs.rtems.org/branches/master/bsp-howto/getentropy.html)
4444
/// SGX | [`rdrand`](https://en.wikipedia.org/wiki/RDRAND)

‎std/src/sys/pal/unix/process/process_unix.rs

+43-11
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@ impl Command {
448448
use core::sync::atomic::{AtomicU8, Ordering};
449449

450450
use crate::mem::MaybeUninit;
451-
use crate::sys::weak::weak;
452451
use crate::sys::{self, cvt_nz, on_broken_pipe_flag_used};
453452

454453
if self.get_gid().is_some()
@@ -462,6 +461,8 @@ impl Command {
462461

463462
cfg_if::cfg_if! {
464463
if #[cfg(target_os = "linux")] {
464+
use crate::sys::weak::weak;
465+
465466
weak! {
466467
fn pidfd_spawnp(
467468
*mut libc::c_int,
@@ -575,16 +576,44 @@ impl Command {
575576
}
576577
}
577578

578-
// Solaris, glibc 2.29+, and musl 1.24+ can set a new working directory,
579-
// and maybe others will gain this non-POSIX function too. We'll check
580-
// for this weak symbol as soon as it's needed, so we can return early
581-
// otherwise to do a manual chdir before exec.
582-
weak! {
583-
fn posix_spawn_file_actions_addchdir_np(
584-
*mut libc::posix_spawn_file_actions_t,
585-
*const libc::c_char
586-
) -> libc::c_int
579+
type PosixSpawnAddChdirFn = unsafe extern "C" fn(
580+
*mut libc::posix_spawn_file_actions_t,
581+
*const libc::c_char,
582+
) -> libc::c_int;
583+
584+
/// Get the function pointer for adding a chdir action to a
585+
/// `posix_spawn_file_actions_t`, if available, assuming a dynamic libc.
586+
///
587+
/// Some platforms can set a new working directory for a spawned process in the
588+
/// `posix_spawn` path. This function looks up the function pointer for adding
589+
/// such an action to a `posix_spawn_file_actions_t` struct.
590+
#[cfg(not(all(target_os = "linux", target_env = "musl")))]
591+
fn get_posix_spawn_addchdir() -> Option<PosixSpawnAddChdirFn> {
592+
use crate::sys::weak::weak;
593+
594+
weak! {
595+
fn posix_spawn_file_actions_addchdir_np(
596+
*mut libc::posix_spawn_file_actions_t,
597+
*const libc::c_char
598+
) -> libc::c_int
599+
}
600+
601+
posix_spawn_file_actions_addchdir_np.get()
602+
}
603+
604+
/// Get the function pointer for adding a chdir action to a
605+
/// `posix_spawn_file_actions_t`, if available, on platforms where the function
606+
/// is known to exist.
607+
///
608+
/// Weak symbol lookup doesn't work with statically linked libcs, so in cases
609+
/// where static linking is possible we need to either check for the presence
610+
/// of the symbol at compile time or know about it upfront.
611+
#[cfg(all(target_os = "linux", target_env = "musl"))]
612+
fn get_posix_spawn_addchdir() -> Option<PosixSpawnAddChdirFn> {
613+
// Our minimum required musl supports this function, so we can just use it.
614+
Some(libc::posix_spawn_file_actions_addchdir_np)
587615
}
616+
588617
let addchdir = match self.get_cwd() {
589618
Some(cwd) => {
590619
if cfg!(target_vendor = "apple") {
@@ -597,7 +626,10 @@ impl Command {
597626
return Ok(None);
598627
}
599628
}
600-
match posix_spawn_file_actions_addchdir_np.get() {
629+
// Check for the availability of the posix_spawn addchdir
630+
// function now. If it isn't available, bail and use the
631+
// fork/exec path.
632+
match get_posix_spawn_addchdir() {
601633
Some(f) => Some((f, cwd)),
602634
None => return Ok(None),
603635
}

‎std/src/sys/random/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ cfg_if::cfg_if! {
4040
mod horizon;
4141
pub use horizon::fill_bytes;
4242
} else if #[cfg(any(
43+
target_os = "aix",
4344
target_os = "hurd",
4445
target_os = "l4re",
4546
target_os = "nto",

‎std/src/sys/thread_local/statik.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ pub macro thread_local_inner {
1414
(@key $t:ty, const $init:expr) => {{
1515
const __INIT: $t = $init;
1616

17+
// NOTE: Please update the shadowing test in `tests/thread.rs` if these types are renamed.
1718
unsafe {
18-
use $crate::thread::LocalKey;
19-
use $crate::thread::local_impl::EagerStorage;
20-
21-
LocalKey::new(|_| {
22-
static VAL: EagerStorage<$t> = EagerStorage { value: __INIT };
19+
$crate::thread::LocalKey::new(|_| {
20+
static VAL: $crate::thread::local_impl::EagerStorage<$t> =
21+
$crate::thread::local_impl::EagerStorage { value: __INIT };
2322
&VAL.value
2423
})
2524
}

0 commit comments

Comments
 (0)