Skip to content

Commit 959b450

Browse files
committed
Auto merge of #146636 - Mark-Simulacrum:bootstrap-bump, r=jieyouxu
Bump bootstrap compiler to 1.91 beta https://forge.rust-lang.org/release/process.html#default-branch-bootstrap-update-tuesday
2 parents e131842 + 54669d7 commit 959b450

File tree

43 files changed

+646
-676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+646
-676
lines changed

compiler/rustc_const_eval/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// tidy-alphabetical-start
22
#![allow(internal_features)]
33
#![allow(rustc::diagnostic_outside_of_impl)]
4-
#![cfg_attr(bootstrap, feature(strict_overflow_ops))]
54
#![doc(rust_logo)]
65
#![feature(array_try_map)]
76
#![feature(assert_matches)]

compiler/rustc_feature/src/accepted.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ declare_features! (
205205
(accepted, extended_key_value_attributes, "1.54.0", Some(78835)),
206206
/// Allows using `aapcs`, `efiapi`, `sysv64` and `win64` as calling conventions
207207
/// for functions with varargs.
208-
(accepted, extended_varargs_abi_support, "CURRENT_RUSTC_VERSION", Some(100189)),
208+
(accepted, extended_varargs_abi_support, "1.91.0", Some(100189)),
209209
/// Allows resolving absolute paths as paths from other crates.
210210
(accepted, extern_absolute_paths, "1.30.0", Some(44660)),
211211
/// Allows `extern crate foo as bar;`. This puts `bar` into extern prelude.
@@ -400,7 +400,7 @@ declare_features! (
400400
/// Allows use of `&foo[a..b]` as a slicing syntax.
401401
(accepted, slicing_syntax, "1.0.0", None),
402402
/// Allows use of `sse4a` target feature.
403-
(accepted, sse4a_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
403+
(accepted, sse4a_target_feature, "1.91.0", Some(44839)),
404404
/// Allows elision of `'static` lifetimes in `static`s and `const`s.
405405
(accepted, static_in_const, "1.17.0", Some(35897)),
406406
/// Allows the definition recursive static items.
@@ -414,7 +414,7 @@ declare_features! (
414414
/// Allows the use of `#[target_feature]` on safe functions.
415415
(accepted, target_feature_11, "1.86.0", Some(69098)),
416416
/// Allows use of `tbm` target feature.
417-
(accepted, tbm_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
417+
(accepted, tbm_target_feature, "1.91.0", Some(44839)),
418418
/// Allows `fn main()` with return types which implements `Termination` (RFC 1937).
419419
(accepted, termination_trait, "1.26.0", Some(43301)),
420420
/// Allows `#[test]` functions where the return type implements `Termination` (RFC 1937).

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ declare_features! (
192192
(removed, no_debug, "1.43.0", Some(29721), Some("removed due to lack of demand"), 69667),
193193
// Allows the use of `no_sanitize` attribute.
194194
/// The feature was renamed to `sanitize` and the attribute to `#[sanitize(xyz = "on|off")]`
195-
(removed, no_sanitize, "CURRENT_RUSTC_VERSION", Some(39699), Some(r#"renamed to sanitize(xyz = "on|off")"#), 142681),
195+
(removed, no_sanitize, "1.91.0", Some(39699), Some(r#"renamed to sanitize(xyz = "on|off")"#), 142681),
196196
/// Note: this feature was previously recorded in a separate
197197
/// `STABLE_REMOVED` list because it, uniquely, was once stable but was
198198
/// then removed. But there was no utility storing it separately, so now
@@ -203,7 +203,7 @@ declare_features! (
203203
(removed, object_safe_for_dispatch, "1.83.0", Some(43561),
204204
Some("renamed to `dyn_compatible_for_dispatch`"), 131511),
205205
/// Allows using `#[omit_gdb_pretty_printer_section]`.
206-
(removed, omit_gdb_pretty_printer_section, "CURRENT_RUSTC_VERSION", None, None, 144738),
206+
(removed, omit_gdb_pretty_printer_section, "1.91.0", None, None, 144738),
207207
/// Allows using `#[on_unimplemented(..)]` on traits.
208208
/// (Moved to `rustc_attrs`.)
209209
(removed, on_unimplemented, "1.40.0", None, None, 65794),

compiler/rustc_feature/src/unstable.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ declare_features! (
327327
(unstable, m68k_target_feature, "1.85.0", Some(134328)),
328328
(unstable, mips_target_feature, "1.27.0", Some(44839)),
329329
(unstable, movrs_target_feature, "1.88.0", Some(137976)),
330-
(unstable, nvptx_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
330+
(unstable, nvptx_target_feature, "1.91.0", Some(44839)),
331331
(unstable, powerpc_target_feature, "1.27.0", Some(44839)),
332332
(unstable, prfchw_target_feature, "1.78.0", Some(44839)),
333333
(unstable, riscv_target_feature, "1.45.0", Some(44839)),
@@ -471,7 +471,7 @@ declare_features! (
471471
/// Allows deref patterns.
472472
(incomplete, deref_patterns, "1.79.0", Some(87121)),
473473
/// Allows deriving the From trait on single-field structs.
474-
(unstable, derive_from, "CURRENT_RUSTC_VERSION", Some(144889)),
474+
(unstable, derive_from, "1.91.0", Some(144889)),
475475
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
476476
(unstable, doc_auto_cfg, "1.58.0", Some(43781)),
477477
/// Allows `#[doc(cfg(...))]`.
@@ -481,7 +481,7 @@ declare_features! (
481481
/// Allows `#[doc(masked)]`.
482482
(unstable, doc_masked, "1.21.0", Some(44027)),
483483
/// Allows features to allow target_feature to better interact with traits.
484-
(incomplete, effective_target_features, "CURRENT_RUSTC_VERSION", Some(143352)),
484+
(incomplete, effective_target_features, "1.91.0", Some(143352)),
485485
/// Allows the .use postfix syntax `x.use` and use closures `use |x| { ... }`
486486
(incomplete, ergonomic_clones, "1.87.0", Some(132290)),
487487
/// Allows exhaustive pattern matching on types that contain uninhabited types.
@@ -554,9 +554,9 @@ declare_features! (
554554
/// Allows fused `loop`/`match` for direct intraprocedural jumps.
555555
(incomplete, loop_match, "1.90.0", Some(132306)),
556556
/// Allow `macro_rules!` attribute rules
557-
(unstable, macro_attr, "CURRENT_RUSTC_VERSION", Some(83527)),
557+
(unstable, macro_attr, "1.91.0", Some(83527)),
558558
/// Allow `macro_rules!` derive rules
559-
(unstable, macro_derive, "CURRENT_RUSTC_VERSION", Some(143549)),
559+
(unstable, macro_derive, "1.91.0", Some(143549)),
560560
/// Give access to additional metadata about declarative macro meta-variables.
561561
(unstable, macro_metavar_expr, "1.61.0", Some(83527)),
562562
/// Provides a way to concatenate identifiers using metavariable expressions.
@@ -613,7 +613,7 @@ declare_features! (
613613
(unstable, proc_macro_hygiene, "1.30.0", Some(54727)),
614614
/// Allows the use of raw-dylibs on ELF platforms
615615
(incomplete, raw_dylib_elf, "1.87.0", Some(135694)),
616-
(unstable, reborrow, "CURRENT_RUSTC_VERSION", Some(145612)),
616+
(unstable, reborrow, "1.91.0", Some(145612)),
617617
/// Makes `&` and `&mut` patterns eat only one layer of references in Rust 2024.
618618
(incomplete, ref_pat_eat_one_layer_2024, "1.79.0", Some(123076)),
619619
/// Makes `&` and `&mut` patterns eat only one layer of references in Rust 2024—structural variant
@@ -627,13 +627,13 @@ declare_features! (
627627
/// Allows `extern "rust-cold"`.
628628
(unstable, rust_cold_cc, "1.63.0", Some(97544)),
629629
/// Allows the use of the `sanitize` attribute.
630-
(unstable, sanitize, "CURRENT_RUSTC_VERSION", Some(39699)),
630+
(unstable, sanitize, "1.91.0", Some(39699)),
631631
/// Allows the use of SIMD types in functions declared in `extern` blocks.
632632
(unstable, simd_ffi, "1.0.0", Some(27731)),
633633
/// Allows specialization of implementations (RFC 1210).
634634
(incomplete, specialization, "1.7.0", Some(31844)),
635635
/// Allows using `#[rustc_align_static(...)]` on static items.
636-
(unstable, static_align, "CURRENT_RUSTC_VERSION", Some(146177)),
636+
(unstable, static_align, "1.91.0", Some(146177)),
637637
/// Allows attributes on expressions and non-item statements.
638638
(unstable, stmt_expr_attributes, "1.6.0", Some(15701)),
639639
/// Allows lints part of the strict provenance effort.
@@ -645,7 +645,7 @@ declare_features! (
645645
/// Allows subtrait items to shadow supertrait items.
646646
(unstable, supertrait_item_shadowing, "1.86.0", Some(89151)),
647647
/// Allows the use of target_feature when a function is marked inline(always).
648-
(unstable, target_feature_inline_always, "CURRENT_RUSTC_VERSION", Some(145574)),
648+
(unstable, target_feature_inline_always, "1.91.0", Some(145574)),
649649
/// Allows using `#[thread_local]` on `static` items.
650650
(unstable, thread_local, "1.0.0", Some(29594)),
651651
/// Allows defining `trait X = A + B;` alias items.

compiler/rustc_index/src/idx.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,6 @@ impl<I: Idx, T> IntoSliceIdx<I, [T]> for core::range::RangeFrom<I> {
130130
impl<I: Idx, T> IntoSliceIdx<I, [T]> for core::range::RangeInclusive<I> {
131131
type Output = core::range::RangeInclusive<usize>;
132132
#[inline]
133-
#[cfg(bootstrap)]
134-
fn into_slice_idx(self) -> Self::Output {
135-
core::range::RangeInclusive { start: self.start.index(), end: self.end.index() }
136-
}
137-
#[inline]
138-
#[cfg(not(bootstrap))]
139133
fn into_slice_idx(self) -> Self::Output {
140134
core::range::RangeInclusive { start: self.start.index(), last: self.last.index() }
141135
}

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,10 +2309,10 @@ declare_lint! {
23092309
/// ### Example
23102310
///
23112311
/// ```rust
2312-
/// #![cfg_attr(not(bootstrap), feature(sanitize))]
2312+
/// #![feature(sanitize)]
23132313
///
23142314
/// #[inline(always)]
2315-
/// #[cfg_attr(not(bootstrap), sanitize(address = "off"))]
2315+
/// #[sanitize(address = "off")]
23162316
/// fn x() {}
23172317
///
23182318
/// fn main() {
@@ -4837,16 +4837,13 @@ declare_lint! {
48374837
///
48384838
/// ### Example
48394839
///
4840-
#[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
4841-
#[cfg_attr(bootstrap, doc = "```rust")]
4840+
/// ```rust,compile_fail
48424841
/// #![doc = in_root!()]
48434842
///
48444843
/// macro_rules! in_root { () => { "" } }
48454844
///
48464845
/// fn main() {}
4847-
#[cfg_attr(not(bootstrap), doc = "```")]
4848-
#[cfg_attr(bootstrap, doc = "```")]
4849-
// ^ Needed to avoid tidy warning about odd number of backticks
4846+
/// ```
48504847
///
48514848
/// {{produces}}
48524849
///

compiler/rustc_middle/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#![allow(rustc::diagnostic_outside_of_impl)]
3030
#![allow(rustc::direct_use_of_rustc_type_ir)]
3131
#![allow(rustc::untranslatable_diagnostic)]
32-
#![cfg_attr(bootstrap, feature(round_char_boundary))]
3332
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
3433
#![doc(rust_logo)]
3534
#![feature(allocator_api)]

compiler/rustc_span/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
1818
// tidy-alphabetical-start
1919
#![allow(internal_features)]
20-
#![cfg_attr(bootstrap, feature(round_char_boundary))]
2120
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2221
#![doc(rust_logo)]
2322
#![feature(array_windows)]

library/alloc/src/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1706,7 +1706,7 @@ impl Default for Box<str> {
17061706
}
17071707

17081708
#[cfg(not(no_global_oom_handling))]
1709-
#[stable(feature = "pin_default_impls", since = "CURRENT_RUSTC_VERSION")]
1709+
#[stable(feature = "pin_default_impls", since = "1.91.0")]
17101710
impl<T> Default for Pin<Box<T>>
17111711
where
17121712
T: ?Sized,

library/alloc/src/collections/btree/map.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
14561456
/// assert_eq!(low.keys().copied().collect::<Vec<_>>(), [0, 1, 2, 3]);
14571457
/// assert_eq!(high.keys().copied().collect::<Vec<_>>(), [4, 5, 6, 7]);
14581458
/// ```
1459-
#[stable(feature = "btree_extract_if", since = "CURRENT_RUSTC_VERSION")]
1459+
#[stable(feature = "btree_extract_if", since = "1.91.0")]
14601460
pub fn extract_if<F, R>(&mut self, range: R, pred: F) -> ExtractIf<'_, K, V, R, F, A>
14611461
where
14621462
K: Ord,
@@ -1943,7 +1943,7 @@ impl<K, V> Default for Values<'_, K, V> {
19431943
}
19441944

19451945
/// An iterator produced by calling `extract_if` on BTreeMap.
1946-
#[stable(feature = "btree_extract_if", since = "CURRENT_RUSTC_VERSION")]
1946+
#[stable(feature = "btree_extract_if", since = "1.91.0")]
19471947
#[must_use = "iterators are lazy and do nothing unless consumed"]
19481948
pub struct ExtractIf<
19491949
'a,
@@ -1976,7 +1976,7 @@ pub(super) struct ExtractIfInner<'a, K, V, R> {
19761976
range: R,
19771977
}
19781978

1979-
#[stable(feature = "btree_extract_if", since = "CURRENT_RUSTC_VERSION")]
1979+
#[stable(feature = "btree_extract_if", since = "1.91.0")]
19801980
impl<K, V, R, F, A> fmt::Debug for ExtractIf<'_, K, V, R, F, A>
19811981
where
19821982
K: fmt::Debug,
@@ -1988,7 +1988,7 @@ where
19881988
}
19891989
}
19901990

1991-
#[stable(feature = "btree_extract_if", since = "CURRENT_RUSTC_VERSION")]
1991+
#[stable(feature = "btree_extract_if", since = "1.91.0")]
19921992
impl<K, V, R, F, A: Allocator + Clone> Iterator for ExtractIf<'_, K, V, R, F, A>
19931993
where
19941994
K: PartialOrd,
@@ -2062,7 +2062,7 @@ impl<'a, K, V, R> ExtractIfInner<'a, K, V, R> {
20622062
}
20632063
}
20642064

2065-
#[stable(feature = "btree_extract_if", since = "CURRENT_RUSTC_VERSION")]
2065+
#[stable(feature = "btree_extract_if", since = "1.91.0")]
20662066
impl<K, V, R, F> FusedIterator for ExtractIf<'_, K, V, R, F>
20672067
where
20682068
K: PartialOrd,

0 commit comments

Comments
 (0)