mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #90754 - matthiaskrgr:rollup-v0483m5, r=matthiaskrgr

Browse Source 
Rollup of 3 pull requests

Successful merges:

 - #90690 (kmc-solid: Avoid the use of `asm_const`)
 - #90748 (Add a real tracking issue for `CommandExt::groups`)
 - #90751 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2021-11-10 06:15:50 +00:00
commit 493ea776eb
8 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/std/src/keyword_docs.rs
View File

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

2
library/std/src/os/unix/process.rs
View File

@ -39,7 +39,7 @@ pub trait CommandExt: Sealed {
/// Sets the supplementary group IDs for the calling process. Translates to /// Sets the supplementary group IDs for the calling process. Translates to
/// a `setgroups` call in the child process. /// a `setgroups` call in the child process.
#[unstable(feature = "setgroups", issue = "38527", reason = "")] #[unstable(feature = "setgroups", issue = "90747")]
fn groups( fn groups(
&mut self, &mut self,
#[cfg(not(target_os = "vxworks"))] groups: &[u32], #[cfg(not(target_os = "vxworks"))] groups: &[u32],

13
library/std/src/sys/solid/abi/mod.rs
View File

@ -4,17 +4,15 @@ mod fs;
pub mod sockets; pub mod sockets;
pub use self::fs::*; pub use self::fs::*;
pub const SOLID_BP_PROGRAM_EXITED: usize = 15;
pub const SOLID_BP_CSABORT: usize = 16;
#[inline(always)] #[inline(always)]
pub fn breakpoint_program_exited(tid: usize) { pub fn breakpoint_program_exited(tid: usize) {
unsafe { unsafe {
match () { match () {
// SOLID_BP_PROGRAM_EXITED = 15
#[cfg(target_arch = "arm")] #[cfg(target_arch = "arm")]
() => asm!("bkpt #{}", const SOLID_BP_PROGRAM_EXITED, in("r0") tid), () => asm!("bkpt #15", in("r0") tid),
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
() => asm!("hlt #{}", const SOLID_BP_PROGRAM_EXITED, in("x0") tid), () => asm!("hlt #15", in("x0") tid),
} }
} }
} }
@ -23,10 +21,11 @@ pub fn breakpoint_program_exited(tid: usize) {
pub fn breakpoint_abort() { pub fn breakpoint_abort() {
unsafe { unsafe {
match () { match () {
// SOLID_BP_CSABORT = 16
#[cfg(target_arch = "arm")] #[cfg(target_arch = "arm")]
() => asm!("bkpt #{}", const SOLID_BP_CSABORT), () => asm!("bkpt #16"),
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
() => asm!("hlt #{}", const SOLID_BP_CSABORT), () => asm!("hlt #16"),
} }
} }
} }

2
src/doc/book

@ -1 +1 @@
Subproject commit fd9299792852c9a368cb236748781852f75cdac6 Subproject commit 5c5dbc5b196c9564422b3193264f3288d2a051ce

2
src/doc/edition-guide

@ -1 +1 @@
Subproject commit 7c0088ca744d293a5f4b1e2ac378e7c23d30fe55 Subproject commit 27f4a84d3852e9416cae5861254fa53a825c56bd

2
src/doc/nomicon

@ -1 +1 @@
Subproject commit 358e6a61d5f4f0496d0a81e70cdcd25d05307342 Subproject commit c6b4bf831e9a40aec34f53067d20634839a6778b

2
src/doc/rust-by-example

@ -1 +1 @@
Subproject commit 27f1ff5e440ef78828b68ab882b98e1b10d9af32 Subproject commit e9d45342d7a6c1def4731f1782d87ea317ba30c3

2
src/doc/rustc-dev-guide

@ -1 +1 @@
Subproject commit b06008731af0f7d07cd0614e820c8276dfed1c18 Subproject commit 196ef69aa68f2cef44f37566ee7db37daf00301b