Skip to content

Commit 680cdf8

Browse files
borsbors
committed
Auto merge of #115056 - Mark-Simulacrum:beta-backport, r=Mark-Simulacrum
[beta] promote 1.73.0 to beta * Bump version placeholder * Bump CI channel to beta r? `@Mark-Simulacrum`
2 parents b053db2 + daa6ebe commit 680cdf8

File tree

13 files changed

+36
-36
lines changed

13 files changed

+36
-36
lines changed

‎compiler/rustc_feature/src/active.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ declare_features! (
282282
(active, arm_target_feature, "1.27.0", Some(44839), None),
283283
(active, avx512_target_feature, "1.27.0", Some(44839), None),
284284
(active, bpf_target_feature, "1.54.0", Some(44839), None),
285-
(active, csky_target_feature, "CURRENT_RUSTC_VERSION", Some(44839), None),
285+
(active, csky_target_feature, "1.73.0", Some(44839), None),
286286
(active, ermsb_target_feature, "1.49.0", Some(44839), None),
287287
(active, hexagon_target_feature, "1.27.0", Some(44839), None),
288288
(active, mips_target_feature, "1.27.0", Some(44839), None),
@@ -315,7 +315,7 @@ declare_features! (
315315
/// Allows `extern "ptx-*" fn()`.
316316
(active, abi_ptx, "1.15.0", Some(38788), None),
317317
/// Allows `extern "riscv-interrupt-m" fn()` and `extern "riscv-interrupt-s" fn()`.
318-
(active, abi_riscv_interrupt, "CURRENT_RUSTC_VERSION", Some(111889), None),
318+
(active, abi_riscv_interrupt, "1.73.0", Some(111889), None),
319319
/// Allows `extern "x86-interrupt" fn()`.
320320
(active, abi_x86_interrupt, "1.17.0", Some(40180), None),
321321
/// Allows additional const parameter types, such as `&'static str` or user defined types
@@ -341,7 +341,7 @@ declare_features! (
341341
/// Allows async functions to be declared, implemented, and used in traits.
342342
(active, async_fn_in_trait, "1.66.0", Some(91611), None),
343343
/// Allows `#[track_caller]` on async functions.
344-
(active, async_fn_track_caller, "CURRENT_RUSTC_VERSION", Some(110011), None),
344+
(active, async_fn_track_caller, "1.73.0", Some(110011), None),
345345
/// Allows builtin # foo() syntax
346346
(active, builtin_syntax, "1.71.0", Some(110680), None),
347347
/// Allows `c"foo"` literals.
@@ -353,7 +353,7 @@ declare_features! (
353353
/// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.
354354
(active, cfg_overflow_checks, "1.71.0", Some(111466), None),
355355
/// Provides the relocation model information as cfg entry
356-
(active, cfg_relocation_model, "CURRENT_RUSTC_VERSION", Some(114929), None),
356+
(active, cfg_relocation_model, "1.73.0", Some(114929), None),
357357
/// Allows the use of `#[cfg(sanitize = "option")]`; set when -Zsanitizer is used.
358358
(active, cfg_sanitize, "1.41.0", Some(39699), None),
359359
/// Allows `cfg(target_abi = "...")`.
@@ -411,7 +411,7 @@ declare_features! (
411411
/// Allows having using `suggestion` in the `#[deprecated]` attribute.
412412
(active, deprecated_suggestion, "1.61.0", Some(94785), None),
413413
/// Allows using the `#[diagnostic]` attribute tool namespace
414-
(active, diagnostic_namespace, "CURRENT_RUSTC_VERSION", Some(94785), None),
414+
(active, diagnostic_namespace, "1.73.0", Some(94785), None),
415415
/// Controls errors in trait implementations.
416416
(active, do_not_recommend, "1.67.0", Some(51992), None),
417417
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
@@ -456,7 +456,7 @@ declare_features! (
456456
/// Allows non-trivial generic constants which have to have wfness manually propagated to callers
457457
(incomplete, generic_const_exprs, "1.56.0", Some(76560), None),
458458
/// Allows generic parameters and where-clauses on free & associated const items.
459-
(incomplete, generic_const_items, "CURRENT_RUSTC_VERSION", Some(113521), None),
459+
(incomplete, generic_const_items, "1.73.0", Some(113521), None),
460460
/// Allows using `..=X` as a patterns in slices.
461461
(active, half_open_range_patterns_in_slices, "1.66.0", Some(67264), None),
462462
/// Allows `if let` guard in match arms.

‎library/alloc/src/rc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2719,7 +2719,7 @@ impl<T> Weak<T> {
27192719
/// ```
27202720
#[inline]
27212721
#[stable(feature = "downgraded_weak", since = "1.10.0")]
2722-
#[rustc_const_stable(feature = "const_weak_new", since = "CURRENT_RUSTC_VERSION")]
2722+
#[rustc_const_stable(feature = "const_weak_new", since = "1.73.0")]
27232723
#[must_use]
27242724
pub const fn new() -> Weak<T> {
27252725
Weak {

‎library/alloc/src/sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2501,7 +2501,7 @@ impl<T> Weak<T> {
25012501
/// ```
25022502
#[inline]
25032503
#[stable(feature = "downgraded_weak", since = "1.10.0")]
2504-
#[rustc_const_stable(feature = "const_weak_new", since = "CURRENT_RUSTC_VERSION")]
2504+
#[rustc_const_stable(feature = "const_weak_new", since = "1.73.0")]
25052505
#[must_use]
25062506
pub const fn new() -> Weak<T> {
25072507
Weak {

‎library/core/src/num/uint_macros.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -2077,8 +2077,8 @@ macro_rules! uint_impl {
20772077
/// ```
20782078
#[doc = concat!("assert_eq!(7_", stringify!($SelfT), ".div_ceil(4), 2);")]
20792079
/// ```
2080-
#[stable(feature = "int_roundings1", since = "CURRENT_RUSTC_VERSION")]
2081-
#[rustc_const_stable(feature = "int_roundings1", since = "CURRENT_RUSTC_VERSION")]
2080+
#[stable(feature = "int_roundings1", since = "1.73.0")]
2081+
#[rustc_const_stable(feature = "int_roundings1", since = "1.73.0")]
20822082
#[must_use = "this returns the result of the operation, \
20832083
without modifying the original"]
20842084
#[inline]
@@ -2113,8 +2113,8 @@ macro_rules! uint_impl {
21132113
#[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".next_multiple_of(8), 16);")]
21142114
#[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".next_multiple_of(8), 24);")]
21152115
/// ```
2116-
#[stable(feature = "int_roundings1", since = "CURRENT_RUSTC_VERSION")]
2117-
#[rustc_const_stable(feature = "int_roundings1", since = "CURRENT_RUSTC_VERSION")]
2116+
#[stable(feature = "int_roundings1", since = "1.73.0")]
2117+
#[rustc_const_stable(feature = "int_roundings1", since = "1.73.0")]
21182118
#[must_use = "this returns the result of the operation, \
21192119
without modifying the original"]
21202120
#[inline]
@@ -2140,8 +2140,8 @@ macro_rules! uint_impl {
21402140
#[doc = concat!("assert_eq!(1_", stringify!($SelfT), ".checked_next_multiple_of(0), None);")]
21412141
#[doc = concat!("assert_eq!(", stringify!($SelfT), "::MAX.checked_next_multiple_of(2), None);")]
21422142
/// ```
2143-
#[stable(feature = "int_roundings1", since = "CURRENT_RUSTC_VERSION")]
2144-
#[rustc_const_stable(feature = "int_roundings1", since = "CURRENT_RUSTC_VERSION")]
2143+
#[stable(feature = "int_roundings1", since = "1.73.0")]
2144+
#[rustc_const_stable(feature = "int_roundings1", since = "1.73.0")]
21452145
#[must_use = "this returns the result of the operation, \
21462146
without modifying the original"]
21472147
#[inline]

‎library/core/src/ptr/non_null.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ impl<T: ?Sized> NonNull<T> {
367367
///
368368
/// [the module documentation]: crate::ptr#safety
369369
#[stable(feature = "nonnull", since = "1.25.0")]
370-
#[rustc_const_stable(feature = "const_nonnull_as_ref", since = "CURRENT_RUSTC_VERSION")]
370+
#[rustc_const_stable(feature = "const_nonnull_as_ref", since = "1.73.0")]
371371
#[must_use]
372372
#[inline(always)]
373373
pub const unsafe fn as_ref<'a>(&self) -> &'a T {

‎library/core/src/str/traits.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ unsafe impl SliceIndex<str> for ops::Range<usize> {
265265
/// inclusion/exclusion) does not point to the starting byte offset of
266266
/// a character (as defined by `is_char_boundary`), if `begin > end`, or if
267267
/// `end > len`.
268-
#[stable(feature = "slice_index_str_with_ops_bound_pair", since = "CURRENT_RUSTC_VERSION")]
268+
#[stable(feature = "slice_index_str_with_ops_bound_pair", since = "1.73.0")]
269269
unsafe impl SliceIndex<str> for (ops::Bound<usize>, ops::Bound<usize>) {
270270
type Output = str;
271271

‎library/std/src/ffi/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156

157157
#[stable(feature = "alloc_c_string", since = "1.64.0")]
158158
pub use alloc::ffi::{CString, FromVecWithNulError, IntoStringError, NulError};
159-
#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
159+
#[stable(feature = "cstr_from_bytes_until_nul", since = "1.73.0")]
160160
pub use core::ffi::FromBytesUntilNulError;
161161
#[stable(feature = "core_c_str", since = "1.64.0")]
162162
pub use core::ffi::{CStr, FromBytesWithNulError};

‎library/std/src/fs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ impl Seek for File {
849849
}
850850
}
851851

852-
#[stable(feature = "io_traits_arc", since = "CURRENT_RUSTC_VERSION")]
852+
#[stable(feature = "io_traits_arc", since = "1.73.0")]
853853
impl Read for Arc<File> {
854854
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
855855
(&**self).read(buf)
@@ -871,7 +871,7 @@ impl Read for Arc<File> {
871871
(&**self).read_to_string(buf)
872872
}
873873
}
874-
#[stable(feature = "io_traits_arc", since = "CURRENT_RUSTC_VERSION")]
874+
#[stable(feature = "io_traits_arc", since = "1.73.0")]
875875
impl Write for Arc<File> {
876876
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
877877
(&**self).write(buf)
@@ -888,7 +888,7 @@ impl Write for Arc<File> {
888888
(&**self).flush()
889889
}
890890
}
891-
#[stable(feature = "io_traits_arc", since = "CURRENT_RUSTC_VERSION")]
891+
#[stable(feature = "io_traits_arc", since = "1.73.0")]
892892
impl Seek for Arc<File> {
893893
fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
894894
(&**self).seek(pos)

‎library/std/src/io/util.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl SizeHint for Empty {
100100
}
101101
}
102102

103-
#[stable(feature = "empty_write", since = "CURRENT_RUSTC_VERSION")]
103+
#[stable(feature = "empty_write", since = "1.73.0")]
104104
impl Write for Empty {
105105
#[inline]
106106
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
@@ -124,7 +124,7 @@ impl Write for Empty {
124124
}
125125
}
126126

127-
#[stable(feature = "empty_write", since = "CURRENT_RUSTC_VERSION")]
127+
#[stable(feature = "empty_write", since = "1.73.0")]
128128
impl Write for &Empty {
129129
#[inline]
130130
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {

‎library/std/src/os/unix/fs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ impl DirBuilderExt for fs::DirBuilder {
10071007
/// Ok(())
10081008
/// }
10091009
/// ```
1010-
#[stable(feature = "unix_chown", since = "CURRENT_RUSTC_VERSION")]
1010+
#[stable(feature = "unix_chown", since = "1.73.0")]
10111011
pub fn chown<P: AsRef<Path>>(dir: P, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
10121012
sys::fs::chown(dir.as_ref(), uid.unwrap_or(u32::MAX), gid.unwrap_or(u32::MAX))
10131013
}
@@ -1027,7 +1027,7 @@ pub fn chown<P: AsRef<Path>>(dir: P, uid: Option<u32>, gid: Option<u32>) -> io::
10271027
/// Ok(())
10281028
/// }
10291029
/// ```
1030-
#[stable(feature = "unix_chown", since = "CURRENT_RUSTC_VERSION")]
1030+
#[stable(feature = "unix_chown", since = "1.73.0")]
10311031
pub fn fchown<F: AsFd>(fd: F, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
10321032
sys::fs::fchown(fd.as_fd().as_raw_fd(), uid.unwrap_or(u32::MAX), gid.unwrap_or(u32::MAX))
10331033
}
@@ -1047,7 +1047,7 @@ pub fn fchown<F: AsFd>(fd: F, uid: Option<u32>, gid: Option<u32>) -> io::Result<
10471047
/// Ok(())
10481048
/// }
10491049
/// ```
1050-
#[stable(feature = "unix_chown", since = "CURRENT_RUSTC_VERSION")]
1050+
#[stable(feature = "unix_chown", since = "1.73.0")]
10511051
pub fn lchown<P: AsRef<Path>>(dir: P, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
10521052
sys::fs::lchown(dir.as_ref(), uid.unwrap_or(u32::MAX), gid.unwrap_or(u32::MAX))
10531053
}

‎library/std/src/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1535,7 +1535,7 @@ impl From<fs::File> for Stdio {
15351535
pub struct ExitStatus(imp::ExitStatus);
15361536

15371537
/// The default value is one which indicates successful completion.
1538-
#[stable(feature = "process-exitcode-default", since = "CURRENT_RUSTC_VERSION")]
1538+
#[stable(feature = "process-exitcode-default", since = "1.73.0")]
15391539
impl Default for ExitStatus {
15401540
fn default() -> Self {
15411541
// Ideally this would be done by ExitCode::default().into() but that is complicated.

‎library/std/src/thread/local.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ impl<T: 'static> LocalKey<Cell<T>> {
325325
///
326326
/// assert_eq!(X.get(), 123);
327327
/// ```
328-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
328+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
329329
pub fn set(&'static self, value: T) {
330330
self.initialize_with(Cell::new(value), |value, cell| {
331331
if let Some(value) = value {
@@ -358,7 +358,7 @@ impl<T: 'static> LocalKey<Cell<T>> {
358358
///
359359
/// assert_eq!(X.get(), 1);
360360
/// ```
361-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
361+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
362362
pub fn get(&'static self) -> T
363363
where
364364
T: Copy,
@@ -388,7 +388,7 @@ impl<T: 'static> LocalKey<Cell<T>> {
388388
/// assert_eq!(X.take(), Some(1));
389389
/// assert_eq!(X.take(), None);
390390
/// ```
391-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
391+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
392392
pub fn take(&'static self) -> T
393393
where
394394
T: Default,
@@ -418,7 +418,7 @@ impl<T: 'static> LocalKey<Cell<T>> {
418418
/// assert_eq!(X.replace(2), 1);
419419
/// assert_eq!(X.replace(3), 2);
420420
/// ```
421-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
421+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
422422
pub fn replace(&'static self, value: T) -> T {
423423
self.with(|cell| cell.replace(value))
424424
}
@@ -448,7 +448,7 @@ impl<T: 'static> LocalKey<RefCell<T>> {
448448
///
449449
/// X.with_borrow(|v| assert!(v.is_empty()));
450450
/// ```
451-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
451+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
452452
pub fn with_borrow<F, R>(&'static self, f: F) -> R
453453
where
454454
F: FnOnce(&T) -> R,
@@ -481,7 +481,7 @@ impl<T: 'static> LocalKey<RefCell<T>> {
481481
///
482482
/// X.with_borrow(|v| assert_eq!(*v, vec![1]));
483483
/// ```
484-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
484+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
485485
pub fn with_borrow_mut<F, R>(&'static self, f: F) -> R
486486
where
487487
F: FnOnce(&mut T) -> R,
@@ -517,7 +517,7 @@ impl<T: 'static> LocalKey<RefCell<T>> {
517517
///
518518
/// X.with_borrow(|v| assert_eq!(*v, vec![1, 2, 3]));
519519
/// ```
520-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
520+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
521521
pub fn set(&'static self, value: T) {
522522
self.initialize_with(RefCell::new(value), |value, cell| {
523523
if let Some(value) = value {
@@ -558,7 +558,7 @@ impl<T: 'static> LocalKey<RefCell<T>> {
558558
///
559559
/// X.with_borrow(|v| assert!(v.is_empty()));
560560
/// ```
561-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
561+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
562562
pub fn take(&'static self) -> T
563563
where
564564
T: Default,
@@ -589,7 +589,7 @@ impl<T: 'static> LocalKey<RefCell<T>> {
589589
///
590590
/// X.with_borrow(|v| assert_eq!(*v, vec![1, 2, 3]));
591591
/// ```
592-
#[stable(feature = "local_key_cell_methods", since = "CURRENT_RUSTC_VERSION")]
592+
#[stable(feature = "local_key_cell_methods", since = "1.73.0")]
593593
pub fn replace(&'static self, value: T) -> T {
594594
self.with(|cell| cell.replace(value))
595595
}

‎src/ci/channel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly
1+
beta

0 commit comments

Comments
 (0)