Skip to content

Commit 352eb59

Browse files
borsbors
committed
Auto merge of rust-lang#105607 - pietroalbini:pa-beta-1.67.0, r=pietroalbini
[beta] Prepare beta 1.67.0 This PR changes the branch to beta and updates the stabilization version numbers. r? `@ghost`
2 parents f058493 + cfccd7e commit 352eb59

File tree

9 files changed

+70
-64
lines changed

9 files changed

+70
-64
lines changed

‎compiler/rustc_feature/src/accepted.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ declare_features! (
192192
/// Allows irrefutable patterns in `if let` and `while let` statements (RFC 2086).
193193
(accepted, irrefutable_let_patterns, "1.33.0", Some(44495), None),
194194
/// Allows `#[instruction_set(_)]` attribute.
195-
(accepted, isa_attribute, "CURRENT_RUSTC_VERSION", Some(74727), None),
195+
(accepted, isa_attribute, "1.67.0", Some(74727), None),
196196
/// Allows some increased flexibility in the name resolution rules,
197197
/// especially around globs and shadowing (RFC 1560).
198198
(accepted, item_like_imports, "1.15.0", Some(35120), None),
@@ -238,7 +238,7 @@ declare_features! (
238238
/// Allows specifying the bundle link modifier
239239
(accepted, native_link_modifiers_bundle, "1.63.0", Some(81490), None),
240240
/// Allows specifying the verbatim link modifier
241-
(accepted, native_link_modifiers_verbatim, "CURRENT_RUSTC_VERSION", Some(81490), None),
241+
(accepted, native_link_modifiers_verbatim, "1.67.0", Some(81490), None),
242242
/// Allows specifying the whole-archive link modifier
243243
(accepted, native_link_modifiers_whole_archive, "1.61.0", Some(81490), None),
244244
/// Allows using non lexical lifetimes (RFC 2094).

‎compiler/rustc_feature/src/active.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ declare_features! (
420420
/// Allows `impl Trait` as output type in `Fn` traits in return position of functions.
421421
(active, impl_trait_in_fn_trait_return, "1.64.0", Some(99697), None),
422422
/// Allows referencing `Self` and projections in impl-trait.
423-
(active, impl_trait_projections, "CURRENT_RUSTC_VERSION", Some(103532), None),
423+
(active, impl_trait_projections, "1.67.0", Some(103532), None),
424424
/// Allows using imported `main` function
425425
(active, imported_main, "1.53.0", Some(28937), None),
426426
/// Allows associated types in inherent impls.
@@ -507,7 +507,7 @@ declare_features! (
507507
/// Allows lints part of the strict provenance effort.
508508
(active, strict_provenance, "1.61.0", Some(95228), None),
509509
/// Allows string patterns to dereference values to match them.
510-
(active, string_deref_patterns, "CURRENT_RUSTC_VERSION", Some(87121), None),
510+
(active, string_deref_patterns, "1.67.0", Some(87121), None),
511511
/// Allows the use of `#[target_feature]` on safe functions.
512512
(active, target_feature_11, "1.45.0", Some(69098), None),
513513
/// Allows using `#[thread_local]` on `static` items.

‎library/core/src/char/methods.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl char {
140140
/// assert_eq!(None, c);
141141
/// ```
142142
#[stable(feature = "assoc_char_funcs", since = "1.52.0")]
143-
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
143+
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
144144
#[must_use]
145145
#[inline]
146146
pub const fn from_u32(i: u32) -> Option<char> {
@@ -241,7 +241,7 @@ impl char {
241241
/// let _c = char::from_digit(1, 37);
242242
/// ```
243243
#[stable(feature = "assoc_char_funcs", since = "1.52.0")]
244-
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
244+
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
245245
#[must_use]
246246
#[inline]
247247
pub const fn from_digit(num: u32, radix: u32) -> Option<char> {
@@ -338,7 +338,7 @@ impl char {
338338
/// let _ = '1'.to_digit(37);
339339
/// ```
340340
#[stable(feature = "rust1", since = "1.0.0")]
341-
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
341+
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
342342
#[must_use = "this returns the result of the operation, \
343343
without modifying the original"]
344344
#[inline]

‎library/core/src/char/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub fn decode_utf16<I: IntoIterator<Item = u16>>(iter: I) -> DecodeUtf16<I::Into
110110

111111
/// Converts a `u32` to a `char`. Use [`char::from_u32`] instead.
112112
#[stable(feature = "rust1", since = "1.0.0")]
113-
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
113+
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
114114
#[must_use]
115115
#[inline]
116116
pub const fn from_u32(i: u32) -> Option<char> {
@@ -130,7 +130,7 @@ pub const unsafe fn from_u32_unchecked(i: u32) -> char {
130130

131131
/// Converts a digit in the given radix to a `char`. Use [`char::from_digit`] instead.
132132
#[stable(feature = "rust1", since = "1.0.0")]
133-
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
133+
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
134134
#[must_use]
135135
#[inline]
136136
pub const fn from_digit(num: u32, radix: u32) -> Option<char> {

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -2290,8 +2290,8 @@ macro_rules! int_impl {
22902290
/// ```
22912291
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".ilog(5), 1);")]
22922292
/// ```
2293-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2294-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2293+
#[stable(feature = "int_log", since = "1.67.0")]
2294+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
22952295
#[rustc_allow_const_fn_unstable(const_option)]
22962296
#[must_use = "this returns the result of the operation, \
22972297
without modifying the original"]
@@ -2313,8 +2313,8 @@ macro_rules! int_impl {
23132313
/// ```
23142314
#[doc = concat!("assert_eq!(2", stringify!($SelfT), ".ilog2(), 1);")]
23152315
/// ```
2316-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2317-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2316+
#[stable(feature = "int_log", since = "1.67.0")]
2317+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
23182318
#[rustc_allow_const_fn_unstable(const_option)]
23192319
#[must_use = "this returns the result of the operation, \
23202320
without modifying the original"]
@@ -2335,8 +2335,8 @@ macro_rules! int_impl {
23352335
/// ```
23362336
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".ilog10(), 1);")]
23372337
/// ```
2338-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2339-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2338+
#[stable(feature = "int_log", since = "1.67.0")]
2339+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
23402340
#[rustc_allow_const_fn_unstable(const_option)]
23412341
#[must_use = "this returns the result of the operation, \
23422342
without modifying the original"]
@@ -2360,8 +2360,8 @@ macro_rules! int_impl {
23602360
/// ```
23612361
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".checked_ilog(5), Some(1));")]
23622362
/// ```
2363-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2364-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2363+
#[stable(feature = "int_log", since = "1.67.0")]
2364+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
23652365
#[must_use = "this returns the result of the operation, \
23662366
without modifying the original"]
23672367
#[inline]
@@ -2396,8 +2396,8 @@ macro_rules! int_impl {
23962396
/// ```
23972397
#[doc = concat!("assert_eq!(2", stringify!($SelfT), ".checked_ilog2(), Some(1));")]
23982398
/// ```
2399-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2400-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2399+
#[stable(feature = "int_log", since = "1.67.0")]
2400+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
24012401
#[must_use = "this returns the result of the operation, \
24022402
without modifying the original"]
24032403
#[inline]
@@ -2420,8 +2420,8 @@ macro_rules! int_impl {
24202420
/// ```
24212421
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".checked_ilog10(), Some(1));")]
24222422
/// ```
2423-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2424-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
2423+
#[stable(feature = "int_log", since = "1.67.0")]
2424+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
24252425
#[must_use = "this returns the result of the operation, \
24262426
without modifying the original"]
24272427
#[inline]

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ macro_rules! nonzero_unsigned_operations {
462462
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(8).unwrap().ilog2(), 3);")]
463463
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(9).unwrap().ilog2(), 3);")]
464464
/// ```
465-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
466-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
465+
#[stable(feature = "int_log", since = "1.67.0")]
466+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
467467
#[must_use = "this returns the result of the operation, \
468468
without modifying the original"]
469469
#[inline]
@@ -486,8 +486,8 @@ macro_rules! nonzero_unsigned_operations {
486486
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(100).unwrap().ilog10(), 2);")]
487487
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(101).unwrap().ilog10(), 2);")]
488488
/// ```
489-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
490-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
489+
#[stable(feature = "int_log", since = "1.67.0")]
490+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
491491
#[must_use = "this returns the result of the operation, \
492492
without modifying the original"]
493493
#[inline]
@@ -1253,7 +1253,7 @@ macro_rules! nonzero_bits {
12531253
///
12541254
#[doc = concat!("assert_eq!(", stringify!($Ty), "::BITS, ", stringify!($Int), "::BITS);")]
12551255
/// ```
1256-
#[stable(feature = "nonzero_bits", since = "CURRENT_RUSTC_VERSION")]
1256+
#[stable(feature = "nonzero_bits", since = "1.67.0")]
12571257
pub const BITS: u32 = <$Int>::BITS;
12581258
}
12591259
)+

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,8 @@ macro_rules! uint_impl {
703703
/// ```
704704
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".ilog(5), 1);")]
705705
/// ```
706-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
707-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
706+
#[stable(feature = "int_log", since = "1.67.0")]
707+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
708708
#[rustc_allow_const_fn_unstable(const_option)]
709709
#[must_use = "this returns the result of the operation, \
710710
without modifying the original"]
@@ -726,8 +726,8 @@ macro_rules! uint_impl {
726726
/// ```
727727
#[doc = concat!("assert_eq!(2", stringify!($SelfT), ".ilog2(), 1);")]
728728
/// ```
729-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
730-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
729+
#[stable(feature = "int_log", since = "1.67.0")]
730+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
731731
#[rustc_allow_const_fn_unstable(const_option)]
732732
#[must_use = "this returns the result of the operation, \
733733
without modifying the original"]
@@ -748,8 +748,8 @@ macro_rules! uint_impl {
748748
/// ```
749749
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".ilog10(), 1);")]
750750
/// ```
751-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
752-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
751+
#[stable(feature = "int_log", since = "1.67.0")]
752+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
753753
#[rustc_allow_const_fn_unstable(const_option)]
754754
#[must_use = "this returns the result of the operation, \
755755
without modifying the original"]
@@ -773,8 +773,8 @@ macro_rules! uint_impl {
773773
/// ```
774774
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".checked_ilog(5), Some(1));")]
775775
/// ```
776-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
777-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
776+
#[stable(feature = "int_log", since = "1.67.0")]
777+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
778778
#[must_use = "this returns the result of the operation, \
779779
without modifying the original"]
780780
#[inline]
@@ -809,8 +809,8 @@ macro_rules! uint_impl {
809809
/// ```
810810
#[doc = concat!("assert_eq!(2", stringify!($SelfT), ".checked_ilog2(), Some(1));")]
811811
/// ```
812-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
813-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
812+
#[stable(feature = "int_log", since = "1.67.0")]
813+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
814814
#[must_use = "this returns the result of the operation, \
815815
without modifying the original"]
816816
#[inline]
@@ -831,8 +831,8 @@ macro_rules! uint_impl {
831831
/// ```
832832
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".checked_ilog10(), Some(1));")]
833833
/// ```
834-
#[stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
835-
#[rustc_const_stable(feature = "int_log", since = "CURRENT_RUSTC_VERSION")]
834+
#[stable(feature = "int_log", since = "1.67.0")]
835+
#[rustc_const_stable(feature = "int_log", since = "1.67.0")]
836836
#[must_use = "this returns the result of the operation, \
837837
without modifying the original"]
838838
#[inline]

‎src/bootstrap/dist.rs

+31-25
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ impl Step for Extended {
14701470

14711471
let xform = |p: &Path| {
14721472
let mut contents = t!(fs::read_to_string(p));
1473-
for tool in &["rust-demangler"] {
1473+
for tool in &["rust-demangler", "miri"] {
14741474
if !built_tools.contains(tool) {
14751475
contents = filter(&contents, tool);
14761476
}
@@ -1510,9 +1510,8 @@ impl Step for Extended {
15101510
prepare("rust-std");
15111511
prepare("rust-analysis");
15121512
prepare("clippy");
1513-
prepare("miri");
15141513
prepare("rust-analyzer");
1515-
for tool in &["rust-docs", "rust-demangler"] {
1514+
for tool in &["rust-docs", "rust-demangler", "miri"] {
15161515
if built_tools.contains(tool) {
15171516
prepare(tool);
15181517
}
@@ -1571,9 +1570,8 @@ impl Step for Extended {
15711570
prepare("rust-docs");
15721571
prepare("rust-std");
15731572
prepare("clippy");
1574-
prepare("miri");
15751573
prepare("rust-analyzer");
1576-
for tool in &["rust-demangler"] {
1574+
for tool in &["rust-demangler", "miri"] {
15771575
if built_tools.contains(tool) {
15781576
prepare(tool);
15791577
}
@@ -1710,23 +1708,25 @@ impl Step for Extended {
17101708
.arg(etc.join("msi/remove-duplicates.xsl")),
17111709
);
17121710
}
1713-
builder.run(
1714-
Command::new(&heat)
1715-
.current_dir(&exe)
1716-
.arg("dir")
1717-
.arg("miri")
1718-
.args(&heat_flags)
1719-
.arg("-cg")
1720-
.arg("MiriGroup")
1721-
.arg("-dr")
1722-
.arg("Miri")
1723-
.arg("-var")
1724-
.arg("var.MiriDir")
1725-
.arg("-out")
1726-
.arg(exe.join("MiriGroup.wxs"))
1727-
.arg("-t")
1728-
.arg(etc.join("msi/remove-duplicates.xsl")),
1729-
);
1711+
if built_tools.contains("miri") {
1712+
builder.run(
1713+
Command::new(&heat)
1714+
.current_dir(&exe)
1715+
.arg("dir")
1716+
.arg("miri")
1717+
.args(&heat_flags)
1718+
.arg("-cg")
1719+
.arg("MiriGroup")
1720+
.arg("-dr")
1721+
.arg("Miri")
1722+
.arg("-var")
1723+
.arg("var.MiriDir")
1724+
.arg("-out")
1725+
.arg(exe.join("MiriGroup.wxs"))
1726+
.arg("-t")
1727+
.arg(etc.join("msi/remove-duplicates.xsl")),
1728+
);
1729+
}
17301730
builder.run(
17311731
Command::new(&heat)
17321732
.current_dir(&exe)
@@ -1774,7 +1774,6 @@ impl Step for Extended {
17741774
.arg("-dStdDir=rust-std")
17751775
.arg("-dAnalysisDir=rust-analysis")
17761776
.arg("-dClippyDir=clippy")
1777-
.arg("-dMiriDir=miri")
17781777
.arg("-arch")
17791778
.arg(&arch)
17801779
.arg("-out")
@@ -1788,6 +1787,9 @@ impl Step for Extended {
17881787
if built_tools.contains("rust-analyzer") {
17891788
cmd.arg("-dRustAnalyzerDir=rust-analyzer");
17901789
}
1790+
if built_tools.contains("miri") {
1791+
cmd.arg("-dMiriDir=miri");
1792+
}
17911793
if target.ends_with("windows-gnu") {
17921794
cmd.arg("-dGccDir=rust-mingw");
17931795
}
@@ -1801,7 +1803,9 @@ impl Step for Extended {
18011803
candle("CargoGroup.wxs".as_ref());
18021804
candle("StdGroup.wxs".as_ref());
18031805
candle("ClippyGroup.wxs".as_ref());
1804-
candle("MiriGroup.wxs".as_ref());
1806+
if built_tools.contains("miri") {
1807+
candle("MiriGroup.wxs".as_ref());
1808+
}
18051809
if built_tools.contains("rust-demangler") {
18061810
candle("RustDemanglerGroup.wxs".as_ref());
18071811
}
@@ -1837,9 +1841,11 @@ impl Step for Extended {
18371841
.arg("StdGroup.wixobj")
18381842
.arg("AnalysisGroup.wixobj")
18391843
.arg("ClippyGroup.wixobj")
1840-
.arg("MiriGroup.wixobj")
18411844
.current_dir(&exe);
18421845

1846+
if built_tools.contains("miri") {
1847+
cmd.arg("MiriGroup.wixobj");
1848+
}
18431849
if built_tools.contains("rust-analyzer") {
18441850
cmd.arg("RustAnalyzerGroup.wixobj");
18451851
}

‎src/ci/channel

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

0 commit comments

Comments
 (0)