Skip to content

Commit a6943ae

Browse files
committed
Auto merge of rust-lang#148818 - Zalathar:rollup-4vujcg0, r=Zalathar
Rollup of 13 pull requests Successful merges: - rust-lang#148694 (std: support `RwLock` and thread parking on TEEOS) - rust-lang#148712 (Port `cfg_select!` to the new attribute parsing system) - rust-lang#148760 (rustc_target: hide TargetOptions::vendor) - rust-lang#148771 (IAT: Reinstate early bailout) - rust-lang#148775 (Fix a typo in the documentation for the strict_shr function) - rust-lang#148779 (Implement DynSend and DynSync for std::panic::Location.) - rust-lang#148781 ([rustdoc] Remove unneeded `allow(rustc::potential_query_instability)`) - rust-lang#148783 (add test for assoc type norm wf check) - rust-lang#148785 (Replace `master` branch references with `main`) - rust-lang#148791 (fix "is_closure_like" doc comment) - rust-lang#148792 (Prefer to use file.stable_id over file.name from source map) - rust-lang#148805 (rustc-dev-guide subtree update) - rust-lang#148807 (Document (and test) a problem with `Clone`/`Copy` deriving.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5fd01e9 + 5370a03 commit a6943ae

File tree

5 files changed

+7
-57
lines changed

5 files changed

+7
-57
lines changed

core/src/num/int_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ macro_rules! int_impl {
15031503
}
15041504
}
15051505

1506-
/// Strict shift right. Computes `self >> rhs`, panicking `rhs` is
1506+
/// Strict shift right. Computes `self >> rhs`, panicking if `rhs` is
15071507
/// larger than or equal to the number of bits in `self`.
15081508
///
15091509
/// # Panics

core/src/num/uint_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1900,7 +1900,7 @@ macro_rules! uint_impl {
19001900
}
19011901
}
19021902

1903-
/// Strict shift right. Computes `self >> rhs`, panicking `rhs` is
1903+
/// Strict shift right. Computes `self >> rhs`, panicking if `rhs` is
19041904
/// larger than or equal to the number of bits in `self`.
19051905
///
19061906
/// # Panics

std/src/sys/sync/rwlock/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cfg_select! {
1919
all(target_os = "windows", target_vendor = "win7"),
2020
all(target_vendor = "fortanix", target_env = "sgx"),
2121
target_os = "xous",
22+
target_os = "teeos",
2223
) => {
2324
mod queue;
2425
pub use queue::RwLock;
@@ -27,10 +28,6 @@ cfg_select! {
2728
mod solid;
2829
pub use solid::RwLock;
2930
}
30-
target_os = "teeos" => {
31-
mod teeos;
32-
pub use teeos::RwLock;
33-
}
3431
_ => {
3532
mod no_threads;
3633
pub use no_threads::RwLock;

std/src/sys/sync/rwlock/teeos.rs

Lines changed: 0 additions & 50 deletions
This file was deleted.

std/src/sys/sync/thread_parking/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ cfg_select! {
3535
mod xous;
3636
pub use xous::Parker;
3737
}
38-
target_family = "unix" => {
38+
any(
39+
target_family = "unix",
40+
target_os = "teeos",
41+
) => {
3942
mod pthread;
4043
pub use pthread::Parker;
4144
}

0 commit comments

Comments
 (0)