Skip to content

Commit efd2745

Browse files
committed
Auto merge of rust-lang#107258 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] 1.68 branch Seems like no pending backports this time around. r? `@Mark-Simulacrum`
2 parents 940d00f + c68f5b9 commit efd2745

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

compiler/rustc_feature/src/accepted.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ declare_features! (
4949
/// Allows `#[target_feature(...)]` on aarch64 platforms
5050
(accepted, aarch64_target_feature, "1.61.0", Some(44839), None),
5151
/// Allows using the `efiapi` ABI.
52-
(accepted, abi_efiapi, "CURRENT_RUSTC_VERSION", Some(65815), None),
52+
(accepted, abi_efiapi, "1.68.0", Some(65815), None),
5353
/// Allows the sysV64 ABI to be specified on all platforms
5454
/// instead of just the platforms on which it is the C ABI.
5555
(accepted, abi_sysv64, "1.24.0", Some(36167), None),
@@ -129,7 +129,7 @@ declare_features! (
129129
/// Allows `crate` in paths.
130130
(accepted, crate_in_paths, "1.30.0", Some(45477), None),
131131
/// Allows rustc to inject a default alloc_error_handler
132-
(accepted, default_alloc_error_handler, "CURRENT_RUSTC_VERSION", Some(66741), None),
132+
(accepted, default_alloc_error_handler, "1.68.0", Some(66741), None),
133133
/// Allows using assigning a default type to type parameters in algebraic data type definitions.
134134
(accepted, default_type_params, "1.0.0", None, None),
135135
/// Allows `#[deprecated]` attribute.
@@ -164,7 +164,7 @@ declare_features! (
164164
/// Allows access to crate names passed via `--extern` through prelude.
165165
(accepted, extern_prelude, "1.30.0", Some(44660), None),
166166
/// Allows using F16C intrinsics from `core::arch::{x86, x86_64}`.
167-
(accepted, f16c_target_feature, "CURRENT_RUSTC_VERSION", Some(44839), None),
167+
(accepted, f16c_target_feature, "1.68.0", Some(44839), None),
168168
/// Allows field shorthands (`x` meaning `x: x`) in struct literal expressions.
169169
(accepted, field_init_shorthand, "1.17.0", Some(37340), None),
170170
/// Allows `#[must_use]` on functions, and introduces must-use operators (RFC 1940).

compiler/rustc_feature/src/active.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ declare_features! (
340340
/// Allows `async {}` expressions in const contexts.
341341
(active, const_async_blocks, "1.53.0", Some(85368), None),
342342
/// Allows `const || {}` closures in const contexts.
343-
(incomplete, const_closures, "CURRENT_RUSTC_VERSION", Some(106003), None),
343+
(incomplete, const_closures, "1.68.0", Some(106003), None),
344344
/// Allows limiting the evaluation steps of const expressions
345345
(active, const_eval_limit, "1.43.0", Some(67217), None),
346346
/// Allows the definition of `const extern fn` and `const unsafe extern fn`.

library/alloc/src/collections/vec_deque/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ impl<T> VecDeque<T> {
537537
/// ```
538538
#[inline]
539539
#[stable(feature = "rust1", since = "1.0.0")]
540-
#[rustc_const_stable(feature = "const_vec_deque_new", since = "CURRENT_RUSTC_VERSION")]
540+
#[rustc_const_stable(feature = "const_vec_deque_new", since = "1.68.0")]
541541
#[must_use]
542542
pub const fn new() -> VecDeque<T> {
543543
// FIXME: This should just be `VecDeque::new_in(Global)` once that hits stable.

library/alloc/src/string.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2549,7 +2549,7 @@ impl ToString for char {
25492549
}
25502550

25512551
#[cfg(not(no_global_oom_handling))]
2552-
#[stable(feature = "bool_to_string_specialization", since = "CURRENT_RUSTC_VERSION")]
2552+
#[stable(feature = "bool_to_string_specialization", since = "1.68.0")]
25532553
impl ToString for bool {
25542554
#[inline]
25552555
fn to_string(&self) -> String {

library/core/src/convert/num.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl_from! { u32, f64, #[stable(feature = "lossless_float_conv", since = "1.6.0"
169169
impl_from! { f32, f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")] }
170170

171171
// bool -> Float
172-
#[stable(feature = "float_from_bool", since = "CURRENT_RUSTC_VERSION")]
172+
#[stable(feature = "float_from_bool", since = "1.68.0")]
173173
#[rustc_const_unstable(feature = "const_num_from_num", issue = "87852")]
174174
impl const From<bool> for f32 {
175175
/// Converts `bool` to `f32` losslessly.
@@ -178,7 +178,7 @@ impl const From<bool> for f32 {
178178
small as u8 as Self
179179
}
180180
}
181-
#[stable(feature = "float_from_bool", since = "CURRENT_RUSTC_VERSION")]
181+
#[stable(feature = "float_from_bool", since = "1.68.0")]
182182
#[rustc_const_unstable(feature = "const_num_from_num", issue = "87852")]
183183
impl const From<bool> for f64 {
184184
/// Converts `bool` to `f64` losslessly.

library/core/src/iter/sources/once_with.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pub struct OnceWith<F> {
7373
gen: Option<F>,
7474
}
7575

76-
#[stable(feature = "iter_once_with_debug", since = "CURRENT_RUSTC_VERSION")]
76+
#[stable(feature = "iter_once_with_debug", since = "1.68.0")]
7777
impl<F> fmt::Debug for OnceWith<F> {
7878
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
7979
if self.gen.is_some() {

library/core/src/iter/sources/repeat_with.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub struct RepeatWith<F> {
7878
repeater: F,
7979
}
8080

81-
#[stable(feature = "iterator_repeat_with_debug", since = "CURRENT_RUSTC_VERSION")]
81+
#[stable(feature = "iterator_repeat_with_debug", since = "1.68.0")]
8282
impl<F> fmt::Debug for RepeatWith<F> {
8383
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
8484
f.debug_struct("RepeatWith").finish_non_exhaustive()

library/core/src/pin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ impl<P, U> DispatchFromDyn<Pin<U>> for Pin<P> where P: DispatchFromDyn<U> {}
11641164
/// constructor.
11651165
///
11661166
/// [`Box::pin`]: ../../std/boxed/struct.Box.html#method.pin
1167-
#[stable(feature = "pin_macro", since = "CURRENT_RUSTC_VERSION")]
1167+
#[stable(feature = "pin_macro", since = "1.68.0")]
11681168
#[rustc_macro_transparency = "semitransparent"]
11691169
#[allow_internal_unstable(unsafe_pin_internals)]
11701170
pub macro pin($value:expr $(,)?) {

library/std/src/path.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ pub const MAIN_SEPARATOR: char = crate::sys::path::MAIN_SEP;
271271
/// The primary separator of path components for the current platform.
272272
///
273273
/// For example, `/` on Unix and `\` on Windows.
274-
#[stable(feature = "main_separator_str", since = "CURRENT_RUSTC_VERSION")]
274+
#[stable(feature = "main_separator_str", since = "1.68.0")]
275275
pub const MAIN_SEPARATOR_STR: &str = crate::sys::path::MAIN_SEP_STR;
276276

277277
////////////////////////////////////////////////////////////////////////////////
@@ -1778,7 +1778,7 @@ impl ops::Deref for PathBuf {
17781778
}
17791779
}
17801780

1781-
#[stable(feature = "path_buf_deref_mut", since = "CURRENT_RUSTC_VERSION")]
1781+
#[stable(feature = "path_buf_deref_mut", since = "1.68.0")]
17821782
impl ops::DerefMut for PathBuf {
17831783
#[inline]
17841784
fn deref_mut(&mut self) -> &mut Path {

src/ci/channel

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

0 commit comments

Comments
 (0)