Skip to content

Commit 493ea77

Browse files
committed
Auto merge of rust-lang#90754 - matthiaskrgr:rollup-v0483m5, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#90690 (kmc-solid: Avoid the use of `asm_const`) - rust-lang#90748 (Add a real tracking issue for `CommandExt::groups`) - rust-lang#90751 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents f2f55e8 + e737501 commit 493ea77

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

library/std/src/keyword_docs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ mod break_keyword {}
182182
/// T` and `*mut T`. More about `const` as used in raw pointers can be read at the Rust docs for the [pointer primitive].
183183
///
184184
/// [pointer primitive]: pointer
185-
/// [Rust Book]: ../book/ch03-01-variables-and-mutability.html#differences-between-variables-and-constants
185+
/// [Rust Book]: ../book/ch03-01-variables-and-mutability.html#constants
186186
/// [Reference]: ../reference/items/constant-items.html
187187
/// [const-eval]: ../reference/const_eval.html
188188
mod const_keyword {}

library/std/src/os/unix/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub trait CommandExt: Sealed {
3939

4040
/// Sets the supplementary group IDs for the calling process. Translates to
4141
/// a `setgroups` call in the child process.
42-
#[unstable(feature = "setgroups", issue = "38527", reason = "")]
42+
#[unstable(feature = "setgroups", issue = "90747")]
4343
fn groups(
4444
&mut self,
4545
#[cfg(not(target_os = "vxworks"))] groups: &[u32],

library/std/src/sys/solid/abi/mod.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ mod fs;
44
pub mod sockets;
55
pub use self::fs::*;
66

7-
pub const SOLID_BP_PROGRAM_EXITED: usize = 15;
8-
pub const SOLID_BP_CSABORT: usize = 16;
9-
107
#[inline(always)]
118
pub fn breakpoint_program_exited(tid: usize) {
129
unsafe {
1310
match () {
11+
// SOLID_BP_PROGRAM_EXITED = 15
1412
#[cfg(target_arch = "arm")]
15-
() => asm!("bkpt #{}", const SOLID_BP_PROGRAM_EXITED, in("r0") tid),
13+
() => asm!("bkpt #15", in("r0") tid),
1614
#[cfg(target_arch = "aarch64")]
17-
() => asm!("hlt #{}", const SOLID_BP_PROGRAM_EXITED, in("x0") tid),
15+
() => asm!("hlt #15", in("x0") tid),
1816
}
1917
}
2018
}
@@ -23,10 +21,11 @@ pub fn breakpoint_program_exited(tid: usize) {
2321
pub fn breakpoint_abort() {
2422
unsafe {
2523
match () {
24+
// SOLID_BP_CSABORT = 16
2625
#[cfg(target_arch = "arm")]
27-
() => asm!("bkpt #{}", const SOLID_BP_CSABORT),
26+
() => asm!("bkpt #16"),
2827
#[cfg(target_arch = "aarch64")]
29-
() => asm!("hlt #{}", const SOLID_BP_CSABORT),
28+
() => asm!("hlt #16"),
3029
}
3130
}
3231
}

0 commit comments

Comments
 (0)