diff options
| -rw-r--r-- | library/std/src/keyword_docs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/unix/process.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/solid/abi/mod.rs | 13 | ||||
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/edition-guide | 0 | ||||
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| m--------- | src/doc/rustc-dev-guide | 0 |
8 files changed, 8 insertions, 9 deletions
diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs index 2e938070374..a8365071d61 100644 --- a/library/std/src/keyword_docs.rs +++ b/library/std/src/keyword_docs.rs @@ -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]. /// /// [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 /// [const-eval]: ../reference/const_eval.html mod const_keyword {} diff --git a/library/std/src/os/unix/process.rs b/library/std/src/os/unix/process.rs index 286a7c3b386..01b8303a6c3 100644 --- a/library/std/src/os/unix/process.rs +++ b/library/std/src/os/unix/process.rs @@ -39,7 +39,7 @@ pub trait CommandExt: Sealed { /// Sets the supplementary group IDs for the calling process. Translates to /// a `setgroups` call in the child process. - #[unstable(feature = "setgroups", issue = "38527", reason = "")] + #[unstable(feature = "setgroups", issue = "90747")] fn groups( &mut self, #[cfg(not(target_os = "vxworks"))] groups: &[u32], diff --git a/library/std/src/sys/solid/abi/mod.rs b/library/std/src/sys/solid/abi/mod.rs index 3526440fb85..3205f0db85f 100644 --- a/library/std/src/sys/solid/abi/mod.rs +++ b/library/std/src/sys/solid/abi/mod.rs @@ -4,17 +4,15 @@ mod fs; pub mod sockets; pub use self::fs::*; -pub const SOLID_BP_PROGRAM_EXITED: usize = 15; -pub const SOLID_BP_CSABORT: usize = 16; - #[inline(always)] pub fn breakpoint_program_exited(tid: usize) { unsafe { match () { + // SOLID_BP_PROGRAM_EXITED = 15 #[cfg(target_arch = "arm")] - () => asm!("bkpt #{}", const SOLID_BP_PROGRAM_EXITED, in("r0") tid), + () => asm!("bkpt #15", in("r0") tid), #[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() { unsafe { match () { + // SOLID_BP_CSABORT = 16 #[cfg(target_arch = "arm")] - () => asm!("bkpt #{}", const SOLID_BP_CSABORT), + () => asm!("bkpt #16"), #[cfg(target_arch = "aarch64")] - () => asm!("hlt #{}", const SOLID_BP_CSABORT), + () => asm!("hlt #16"), } } } diff --git a/src/doc/book b/src/doc/book -Subproject fd9299792852c9a368cb236748781852f75cdac +Subproject 5c5dbc5b196c9564422b3193264f3288d2a051c diff --git a/src/doc/edition-guide b/src/doc/edition-guide -Subproject 7c0088ca744d293a5f4b1e2ac378e7c23d30fe5 +Subproject 27f4a84d3852e9416cae5861254fa53a825c56b diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 358e6a61d5f4f0496d0a81e70cdcd25d0530734 +Subproject c6b4bf831e9a40aec34f53067d20634839a6778 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject 27f1ff5e440ef78828b68ab882b98e1b10d9af3 +Subproject e9d45342d7a6c1def4731f1782d87ea317ba30c diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide -Subproject b06008731af0f7d07cd0614e820c8276dfed1c1 +Subproject 196ef69aa68f2cef44f37566ee7db37daf00301 |