Skip to content

Commit f4cfd87

Browse files
committed
Auto merge of rust-lang#120676 - Mark-Simulacrum:bootstrap-bump, r=clubby789
Bump bootstrap compiler to just-built 1.77 beta https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
2 parents e28fae5 + 9a5034a commit f4cfd87

File tree

41 files changed

+485
-618
lines changed

Some content is hidden

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

41 files changed

+485
-618
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ declare_features! (
7777
/// Allows empty structs and enum variants with braces.
7878
(accepted, braced_empty_structs, "1.8.0", Some(29720)),
7979
/// Allows `c"foo"` literals.
80-
(accepted, c_str_literals, "CURRENT_RUSTC_VERSION", Some(105723)),
80+
(accepted, c_str_literals, "1.77.0", Some(105723)),
8181
/// Allows `#[cfg_attr(predicate, multiple, attributes, here)]`.
8282
(accepted, cfg_attr_multi, "1.33.0", Some(54881)),
8383
/// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.

compiler/rustc_feature/src/removed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ declare_features! (
3333
// -------------------------------------------------------------------------
3434

3535
/// Allows using the `amdgpu-kernel` ABI.
36-
(removed, abi_amdgpu_kernel, "CURRENT_RUSTC_VERSION", Some(51575), None),
36+
(removed, abi_amdgpu_kernel, "1.77.0", Some(51575), None),
3737
(removed, advanced_slice_patterns, "1.0.0", Some(62254),
3838
Some("merged into `#![feature(slice_patterns)]`")),
3939
(removed, allocator, "1.0.0", None, None),

compiler/rustc_feature/src/unstable.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ declare_features! (
356356
/// Allows `#[track_caller]` on async functions.
357357
(unstable, async_fn_track_caller, "1.73.0", Some(110011)),
358358
/// Allows `for await` loops.
359-
(unstable, async_for_loop, "CURRENT_RUSTC_VERSION", Some(118898)),
359+
(unstable, async_for_loop, "1.77.0", Some(118898)),
360360
/// Allows builtin # foo() syntax
361361
(unstable, builtin_syntax, "1.71.0", Some(110680)),
362362
/// Treat `extern "C"` function as nounwind.
@@ -370,7 +370,7 @@ declare_features! (
370370
/// Allows the use of `#[cfg(sanitize = "option")]`; set when -Zsanitizer is used.
371371
(unstable, cfg_sanitize, "1.41.0", Some(39699)),
372372
/// Allows `cfg(sanitizer_cfi_generalize_pointers)` and `cfg(sanitizer_cfi_normalize_integers)`.
373-
(unstable, cfg_sanitizer_cfi, "CURRENT_RUSTC_VERSION", Some(89653)),
373+
(unstable, cfg_sanitizer_cfi, "1.77.0", Some(89653)),
374374
/// Allows `cfg(target_abi = "...")`.
375375
(unstable, cfg_target_abi, "1.55.0", Some(80970)),
376376
/// Allows `cfg(target(abi = "..."))`.
@@ -514,7 +514,7 @@ declare_features! (
514514
(unstable, marker_trait_attr, "1.30.0", Some(29864)),
515515
/// Allows exhaustive pattern matching on types that contain uninhabited types in cases that are
516516
/// unambiguously sound.
517-
(incomplete, min_exhaustive_patterns, "CURRENT_RUSTC_VERSION", Some(119612)),
517+
(incomplete, min_exhaustive_patterns, "1.77.0", Some(119612)),
518518
/// A minimal, sound subset of specialization intended to be used by the
519519
/// standard library until the soundness issues with specialization
520520
/// are fixed.
@@ -550,7 +550,7 @@ declare_features! (
550550
/// Allows using enums in offset_of!
551551
(unstable, offset_of_enum, "1.75.0", Some(120141)),
552552
/// Allows using multiple nested field accesses in offset_of!
553-
(unstable, offset_of_nested, "CURRENT_RUSTC_VERSION", Some(120140)),
553+
(unstable, offset_of_nested, "1.77.0", Some(120140)),
554554
/// Allows using `#[optimize(X)]`.
555555
(unstable, optimize_attribute, "1.34.0", Some(54882)),
556556
/// Allows macro attributes on expressions, statements and non-inline modules.

compiler/rustc_index_macros/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ mod newtype;
3131
/// - `#[max = 0xFFFF_FFFD]`: specifies the max value, which allows niche
3232
/// optimizations. The default max value is 0xFFFF_FF00.
3333
/// - `#[gate_rustc_only]`: makes parts of the generated code nightly-only.
34-
///
35-
/// `SpecOptionPartialEq` is specialized by this macro, so using it requires enabling
36-
/// `#![feature(min_specialization)]` for the crate.
3734
#[proc_macro]
3835
#[cfg_attr(
3936
feature = "nightly",
40-
allow_internal_unstable(step_trait, rustc_attrs, trusted_step, spec_option_partial_eq)
37+
allow_internal_unstable(
38+
step_trait,
39+
rustc_attrs,
40+
trusted_step,
41+
spec_option_partial_eq,
42+
min_specialization
43+
)
4144
)]
42-
// FIXME: Remove the above comment about `min_specialization` once bootstrap is bumped,
43-
// and the corresponding one on SpecOptionPartialEq
44-
#[cfg_attr(all(feature = "nightly", not(bootstrap)), allow_internal_unstable(min_specialization))]
4545
pub fn newtype_index(input: TokenStream) -> TokenStream {
4646
newtype::newtype(input)
4747
}

compiler/rustc_lint/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#![feature(if_let_guard)]
3535
#![feature(iter_order_by)]
3636
#![feature(let_chains)]
37-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
37+
#![feature(trait_upcasting)]
3838
#![feature(min_specialization)]
3939
#![feature(rustc_attrs)]
4040
#![allow(internal_features)]

compiler/rustc_middle/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#![feature(associated_type_bounds)]
5050
#![feature(rustc_attrs)]
5151
#![feature(control_flow_enum)]
52-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
52+
#![feature(trait_upcasting)]
5353
#![feature(try_blocks)]
5454
#![feature(decl_macro)]
5555
#![feature(extract_if)]

library/alloc/src/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub use core::slice::{from_mut, from_ref};
5151
pub use core::slice::{from_mut_ptr_range, from_ptr_range};
5252
#[stable(feature = "rust1", since = "1.0.0")]
5353
pub use core::slice::{from_raw_parts, from_raw_parts_mut};
54-
#[stable(feature = "slice_group_by", since = "CURRENT_RUSTC_VERSION")]
54+
#[stable(feature = "slice_group_by", since = "1.77.0")]
5555
pub use core::slice::{ChunkBy, ChunkByMut};
5656
#[stable(feature = "rust1", since = "1.0.0")]
5757
pub use core::slice::{Chunks, Windows};

library/alloc/src/vec/cow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl<'a, T: Clone> From<&'a [T]> for Cow<'a, [T]> {
1515
}
1616
}
1717

18-
#[stable(feature = "cow_from_array_ref", since = "CURRENT_RUSTC_VERSION")]
18+
#[stable(feature = "cow_from_array_ref", since = "1.77.0")]
1919
impl<'a, T: Clone, const N: usize> From<&'a [T; N]> for Cow<'a, [T]> {
2020
/// Creates a [`Borrowed`] variant of [`Cow`]
2121
/// from a reference to an array.

library/core/src/array/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ impl<T, const N: usize> [T; N] {
576576
/// // We can still access the original array: it has not been moved.
577577
/// assert_eq!(strings.len(), 3);
578578
/// ```
579-
#[stable(feature = "array_methods", since = "CURRENT_RUSTC_VERSION")]
579+
#[stable(feature = "array_methods", since = "1.77.0")]
580580
pub fn each_ref(&self) -> [&T; N] {
581581
from_trusted_iterator(self.iter())
582582
}
@@ -595,7 +595,7 @@ impl<T, const N: usize> [T; N] {
595595
/// assert_eq!(float_refs, [&mut 0.0, &mut 2.7, &mut -1.0]);
596596
/// assert_eq!(floats, [0.0, 2.7, -1.0]);
597597
/// ```
598-
#[stable(feature = "array_methods", since = "CURRENT_RUSTC_VERSION")]
598+
#[stable(feature = "array_methods", since = "1.77.0")]
599599
pub fn each_mut(&mut self) -> [&mut T; N] {
600600
from_trusted_iterator(self.iter_mut())
601601
}

library/core/src/async_iter/async_iter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub trait AsyncIterator {
4747
/// Rust's usual rules apply: calls must never cause undefined behavior
4848
/// (memory corruption, incorrect use of `unsafe` functions, or the like),
4949
/// regardless of the async iterator's state.
50-
#[cfg_attr(not(bootstrap), lang = "async_iterator_poll_next")]
50+
#[lang = "async_iterator_poll_next"]
5151
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>>;
5252

5353
/// Returns the bounds on the remaining length of the async iterator.
@@ -145,7 +145,7 @@ pub trait IntoAsyncIterator {
145145
type IntoAsyncIter: AsyncIterator<Item = Self::Item>;
146146

147147
/// Converts `self` into an async iterator
148-
#[cfg_attr(not(bootstrap), lang = "into_async_iter_into_iter")]
148+
#[lang = "into_async_iter_into_iter"]
149149
fn into_async_iter(self) -> Self::IntoAsyncIter;
150150
}
151151

0 commit comments

Comments
 (0)