Skip to content

Commit efc02b0

Browse files
committed
Auto merge of rust-lang#74831 - Manishearth:rollup-ugw4pt4, r=Manishearth
Rollup of 4 pull requests Successful merges: - rust-lang#73858 (Make more primitive integer methods const) - rust-lang#74487 (Forbid generic parameters in anon consts inside of type defaults) - rust-lang#74803 (rustbuild: fix bad usage of UNIX exec() in rustc wrapper) - rust-lang#74822 (More ensure stack to avoid segfault with increased `recursion_limit`) Failed merges: r? @ghost
2 parents 4a90e36 + 539ba96 commit efc02b0

17 files changed

+209
-94
lines changed

src/bootstrap/bin/rustc.rs

+3-10
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ fn main() {
153153
e => e,
154154
};
155155
println!("\nDid not run successfully: {:?}\n{:?}\n-------------", e, cmd);
156-
exec_cmd(&mut on_fail).expect("could not run the backup command");
156+
status_code(&mut on_fail).expect("could not run the backup command");
157157
std::process::exit(1);
158158
}
159159

@@ -182,17 +182,10 @@ fn main() {
182182
}
183183
}
184184

185-
let code = exec_cmd(&mut cmd).unwrap_or_else(|_| panic!("\n\n failed to run {:?}", cmd));
185+
let code = status_code(&mut cmd).unwrap_or_else(|_| panic!("\n\n failed to run {:?}", cmd));
186186
std::process::exit(code);
187187
}
188188

189-
#[cfg(unix)]
190-
fn exec_cmd(cmd: &mut Command) -> io::Result<i32> {
191-
use std::os::unix::process::CommandExt;
192-
Err(cmd.exec())
193-
}
194-
195-
#[cfg(not(unix))]
196-
fn exec_cmd(cmd: &mut Command) -> io::Result<i32> {
189+
fn status_code(cmd: &mut Command) -> io::Result<i32> {
197190
cmd.status().map(|status| status.code().unwrap())
198191
}

src/libcore/char/methods.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ impl char {
12261226
/// assert!(!esc.is_ascii_alphabetic());
12271227
/// ```
12281228
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1229-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1229+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
12301230
#[inline]
12311231
pub const fn is_ascii_alphabetic(&self) -> bool {
12321232
match *self {
@@ -1262,7 +1262,7 @@ impl char {
12621262
/// assert!(!esc.is_ascii_uppercase());
12631263
/// ```
12641264
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1265-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1265+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
12661266
#[inline]
12671267
pub const fn is_ascii_uppercase(&self) -> bool {
12681268
match *self {
@@ -1298,7 +1298,7 @@ impl char {
12981298
/// assert!(!esc.is_ascii_lowercase());
12991299
/// ```
13001300
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1301-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1301+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
13021302
#[inline]
13031303
pub const fn is_ascii_lowercase(&self) -> bool {
13041304
match *self {
@@ -1337,7 +1337,7 @@ impl char {
13371337
/// assert!(!esc.is_ascii_alphanumeric());
13381338
/// ```
13391339
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1340-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1340+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
13411341
#[inline]
13421342
pub const fn is_ascii_alphanumeric(&self) -> bool {
13431343
match *self {
@@ -1373,7 +1373,7 @@ impl char {
13731373
/// assert!(!esc.is_ascii_digit());
13741374
/// ```
13751375
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1376-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1376+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
13771377
#[inline]
13781378
pub const fn is_ascii_digit(&self) -> bool {
13791379
match *self {
@@ -1412,7 +1412,7 @@ impl char {
14121412
/// assert!(!esc.is_ascii_hexdigit());
14131413
/// ```
14141414
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1415-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1415+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
14161416
#[inline]
14171417
pub const fn is_ascii_hexdigit(&self) -> bool {
14181418
match *self {
@@ -1452,7 +1452,7 @@ impl char {
14521452
/// assert!(!esc.is_ascii_punctuation());
14531453
/// ```
14541454
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1455-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1455+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
14561456
#[inline]
14571457
pub const fn is_ascii_punctuation(&self) -> bool {
14581458
match *self {
@@ -1488,7 +1488,7 @@ impl char {
14881488
/// assert!(!esc.is_ascii_graphic());
14891489
/// ```
14901490
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1491-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1491+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
14921492
#[inline]
14931493
pub const fn is_ascii_graphic(&self) -> bool {
14941494
match *self {
@@ -1541,7 +1541,7 @@ impl char {
15411541
/// assert!(!esc.is_ascii_whitespace());
15421542
/// ```
15431543
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1544-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1544+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
15451545
#[inline]
15461546
pub const fn is_ascii_whitespace(&self) -> bool {
15471547
match *self {
@@ -1579,7 +1579,7 @@ impl char {
15791579
/// assert!(esc.is_ascii_control());
15801580
/// ```
15811581
#[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
1582-
#[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
1582+
#[rustc_const_stable(feature = "const_ascii_ctype_on_intrinsics", since = "1.47.0")]
15831583
#[inline]
15841584
pub const fn is_ascii_control(&self) -> bool {
15851585
match *self {

src/libcore/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,11 @@
7070
#![feature(bound_cloned)]
7171
#![feature(cfg_target_has_atomic)]
7272
#![feature(concat_idents)]
73-
#![feature(const_ascii_ctype_on_intrinsics)]
7473
#![feature(const_alloc_layout)]
7574
#![feature(const_discriminant)]
7675
#![feature(const_checked_int_methods)]
7776
#![feature(const_euclidean_int_methods)]
7877
#![feature(const_overflowing_int_methods)]
79-
#![feature(const_saturating_int_methods)]
8078
#![feature(const_int_unchecked_arith)]
8179
#![feature(const_int_pow)]
8280
#![feature(constctlz)]

0 commit comments

Comments
 (0)