Skip to content

Commit 23ce5fc

Browse files
borsbors
committed
Auto merge of #92068 - fee1-dead:libcore2021, r=m-ou-se
Switch all libraries to the 2021 edition The fix for #88638 (comment) is to simply add const-stability for these functions. r? `@m-ou-se` Closes #88638.
2 parents a7e2e33 + 3ae0dab commit 23ce5fc

File tree

20 files changed

+22
-68
lines changed

20 files changed

+22
-68
lines changed

‎library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repository = "https://github.com/rust-lang/rust.git"
66
description = "The Rust core allocation and collections library"
77
autotests = false
88
autobenches = false
9-
edition = "2018"
9+
edition = "2021"
1010

1111
[dependencies]
1212
core = { path = "../core" }

‎library/alloc/src/vec/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -3004,22 +3004,19 @@ impl<T, A: Allocator, const N: usize> TryFrom<Vec<T, A>> for [T; N] {
30043004
/// # Examples
30053005
///
30063006
/// ```
3007-
/// use std::convert::TryInto;
30083007
/// assert_eq!(vec![1, 2, 3].try_into(), Ok([1, 2, 3]));
30093008
/// assert_eq!(<Vec<i32>>::new().try_into(), Ok([]));
30103009
/// ```
30113010
///
30123011
/// If the length doesn't match, the input comes back in `Err`:
30133012
/// ```
3014-
/// use std::convert::TryInto;
30153013
/// let r: Result<[i32; 4], _> = (0..10).collect::<Vec<_>>().try_into();
30163014
/// assert_eq!(r, Err(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9]));
30173015
/// ```
30183016
///
30193017
/// If you're fine with just getting a prefix of the `Vec<T>`,
30203018
/// you can call [`.truncate(N)`](Vec::truncate) first.
30213019
/// ```
3022-
/// use std::convert::TryInto;
30233020
/// let mut v = String::from("hello world").into_bytes();
30243021
/// v.sort();
30253022
/// v.truncate(2);

‎library/core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repository = "https://github.com/rust-lang/rust.git"
66
description = "The Rust Core Library"
77
autotests = false
88
autobenches = false
9-
edition = "2018"
9+
edition = "2021"
1010

1111
[lib]
1212
test = false

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

-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ where
6666
///
6767
/// ```rust
6868
/// #![feature(array_from_fn)]
69-
/// # // Apparently these doc tests are still on edition2018
70-
/// # use std::convert::TryInto;
7169
///
7270
/// let array: Result<[u8; 5], _> = std::array::try_from_fn(|i| i.try_into());
7371
/// assert_eq!(array, Ok([0, 1, 2, 3, 4]));

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

-4
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,6 @@ pub trait TryInto<T>: Sized {
426426
/// `TryFrom<T>` can be implemented as follows:
427427
///
428428
/// ```
429-
/// use std::convert::TryFrom;
430-
///
431429
/// struct GreaterThanZero(i32);
432430
///
433431
/// impl TryFrom<i32> for GreaterThanZero {
@@ -448,8 +446,6 @@ pub trait TryInto<T>: Sized {
448446
/// As described, [`i32`] implements `TryFrom<`[`i64`]`>`:
449447
///
450448
/// ```
451-
/// use std::convert::TryFrom;
452-
///
453449
/// let big_number = 1_000_000_000_000i64;
454450
/// // Silently truncates `big_number`, requires detecting
455451
/// // and handling the truncation after the fact.

‎library/core/src/iter/traits/collect.rs

-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
/// Basic usage:
1616
///
1717
/// ```
18-
/// use std::iter::FromIterator;
19-
///
2018
/// let five_fives = std::iter::repeat(5).take(5);
2119
///
2220
/// let v = Vec::from_iter(five_fives);
@@ -37,8 +35,6 @@
3735
/// Implementing `FromIterator` for your type:
3836
///
3937
/// ```
40-
/// use std::iter::FromIterator;
41-
///
4238
/// // A sample collection, that's just a wrapper over Vec<T>
4339
/// #[derive(Debug)]
4440
/// struct MyCollection(Vec<i32>);
@@ -102,8 +98,6 @@ pub trait FromIterator<A>: Sized {
10298
/// Basic usage:
10399
///
104100
/// ```
105-
/// use std::iter::FromIterator;
106-
///
107101
/// let five_fives = std::iter::repeat(5).take(5);
108102
///
109103
/// let v = Vec::from_iter(five_fives);

‎library/core/src/iter/traits/iterator.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1155,8 +1155,6 @@ pub trait Iterator {
11551155
/// Stopping after an initial [`None`]:
11561156
///
11571157
/// ```
1158-
/// use std::convert::TryFrom;
1159-
///
11601158
/// let a = [0, 1, 2, -3, 4, 5, -6];
11611159
///
11621160
/// let iter = a.iter().map_while(|x| u32::try_from(*x).ok());
@@ -1172,8 +1170,6 @@ pub trait Iterator {
11721170
/// removed:
11731171
///
11741172
/// ```
1175-
/// use std::convert::TryFrom;
1176-
///
11771173
/// let a = [1, 2, -3, 4];
11781174
/// let mut iter = a.iter();
11791175
///

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

-6
Original file line numberDiff line numberDiff line change
@@ -2602,8 +2602,6 @@ macro_rules! int_impl {
26022602
/// When starting from a slice rather than an array, fallible conversion APIs can be used:
26032603
///
26042604
/// ```
2605-
/// use std::convert::TryInto;
2606-
///
26072605
#[doc = concat!("fn read_be_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
26082606
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
26092607
/// *input = rest;
@@ -2633,8 +2631,6 @@ macro_rules! int_impl {
26332631
/// When starting from a slice rather than an array, fallible conversion APIs can be used:
26342632
///
26352633
/// ```
2636-
/// use std::convert::TryInto;
2637-
///
26382634
#[doc = concat!("fn read_le_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
26392635
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
26402636
/// *input = rest;
@@ -2675,8 +2671,6 @@ macro_rules! int_impl {
26752671
/// When starting from a slice rather than an array, fallible conversion APIs can be used:
26762672
///
26772673
/// ```
2678-
/// use std::convert::TryInto;
2679-
///
26802674
#[doc = concat!("fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
26812675
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
26822676
/// *input = rest;

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

-6
Original file line numberDiff line numberDiff line change
@@ -2323,8 +2323,6 @@ macro_rules! uint_impl {
23232323
/// When starting from a slice rather than an array, fallible conversion APIs can be used:
23242324
///
23252325
/// ```
2326-
/// use std::convert::TryInto;
2327-
///
23282326
#[doc = concat!("fn read_be_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
23292327
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
23302328
/// *input = rest;
@@ -2354,8 +2352,6 @@ macro_rules! uint_impl {
23542352
/// When starting from a slice rather than an array, fallible conversion APIs can be used:
23552353
///
23562354
/// ```
2357-
/// use std::convert::TryInto;
2358-
///
23592355
#[doc = concat!("fn read_le_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
23602356
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
23612357
/// *input = rest;
@@ -2396,8 +2392,6 @@ macro_rules! uint_impl {
23962392
/// When starting from a slice rather than an array, fallible conversion APIs can be used:
23972393
///
23982394
/// ```
2399-
/// use std::convert::TryInto;
2400-
///
24012395
#[doc = concat!("fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
24022396
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
24032397
/// *input = rest;

‎library/core/src/panicking.rs

+4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ pub const fn panic(expr: &'static str) -> ! {
5151
#[inline]
5252
#[track_caller]
5353
#[lang = "panic_str"] // needed for `non-fmt-panics` lint
54+
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
5455
pub const fn panic_str(expr: &str) -> ! {
5556
panic_display(&expr);
5657
}
@@ -59,6 +60,7 @@ pub const fn panic_str(expr: &str) -> ! {
5960
#[track_caller]
6061
#[lang = "panic_display"] // needed for const-evaluated panics
6162
#[rustc_do_not_const_check] // hooked by const-eval
63+
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
6264
pub const fn panic_display<T: fmt::Display>(x: &T) -> ! {
6365
panic_fmt(format_args!("{}", *x));
6466
}
@@ -89,6 +91,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
8991
#[track_caller]
9092
#[lang = "panic_fmt"] // needed for const-evaluated panics
9193
#[rustc_do_not_const_check] // hooked by const-eval
94+
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
9295
pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
9396
if cfg!(feature = "panic_immediate_abort") {
9497
super::intrinsics::abort()
@@ -109,6 +112,7 @@ pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
109112

110113
/// This function is used instead of panic_fmt in const eval.
111114
#[lang = "const_panic_fmt"]
115+
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
112116
pub const fn const_panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
113117
if let Some(msg) = fmt.as_str() {
114118
panic_str(msg);

‎library/panic_abort/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
license = "MIT OR Apache-2.0"
55
repository = "https://github.com/rust-lang/rust.git"
66
description = "Implementation of Rust panics via process aborts"
7-
edition = "2018"
7+
edition = "2021"
88

99
[lib]
1010
test = false

‎library/panic_unwind/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
license = "MIT OR Apache-2.0"
55
repository = "https://github.com/rust-lang/rust.git"
66
description = "Implementation of Rust panics via stack unwinding"
7-
edition = "2018"
7+
edition = "2021"
88

99
[lib]
1010
test = false

‎library/proc_macro/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "proc_macro"
33
version = "0.0.0"
4-
edition = "2018"
4+
edition = "2021"
55

66
[dependencies]
77
std = { path = "../std" }

‎library/profiler_builtins/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "profiler_builtins"
33
version = "0.0.0"
4-
edition = "2018"
4+
edition = "2021"
55

66
[lib]
77
test = false

‎library/rustc-std-workspace-alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ license = 'MIT OR Apache-2.0'
55
description = """
66
Hack for the compiler's own build system
77
"""
8-
edition = "2018"
8+
edition = "2021"
99

1010
[lib]
1111
path = "lib.rs"

‎library/rustc-std-workspace-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ license = 'MIT OR Apache-2.0'
55
description = """
66
Hack for the compiler's own build system
77
"""
8-
edition = "2018"
8+
edition = "2021"
99

1010
[lib]
1111
path = "lib.rs"

‎library/rustc-std-workspace-std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ license = 'MIT OR Apache-2.0'
55
description = """
66
Hack for the compiler's own build system
77
"""
8-
edition = "2018"
8+
edition = "2021"
99

1010
[lib]
1111
path = "lib.rs"

‎library/test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "test"
33
version = "0.0.0"
4-
edition = "2018"
4+
edition = "2021"
55

66
[lib]
77
crate-type = ["dylib", "rlib"]

‎library/unwind/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "unwind"
33
version = "0.0.0"
44
license = "MIT OR Apache-2.0"
55
repository = "https://github.com/rust-lang/rust.git"
6-
edition = "2018"
6+
edition = "2021"
77
include = [
88
'/libunwind/*',
99
]

‎src/tools/tidy/src/edition.rs

+7-26
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
33
use std::path::Path;
44

5-
fn is_edition_2018(mut line: &str) -> bool {
6-
line = line.trim();
7-
line == "edition = \"2018\""
8-
}
9-
105
fn is_edition_2021(mut line: &str) -> bool {
116
line = line.trim();
127
line == "edition = \"2021\""
@@ -23,27 +18,13 @@ pub fn check(path: &Path, bad: &mut bool) {
2318
return;
2419
}
2520

26-
// Not all library crates are ready to migrate to 2021.
27-
if file.components().any(|c| c.as_os_str() == "library")
28-
&& file.components().all(|c| c.as_os_str() != "std")
29-
{
30-
let has = contents.lines().any(is_edition_2018);
31-
if !has {
32-
tidy_error!(
33-
bad,
34-
"{} doesn't have `edition = \"2018\"` on a separate line",
35-
file.display()
36-
);
37-
}
38-
} else {
39-
let is_2021 = contents.lines().any(is_edition_2021);
40-
if !is_2021 {
41-
tidy_error!(
42-
bad,
43-
"{} doesn't have `edition = \"2021\"` on a separate line",
44-
file.display()
45-
);
46-
}
21+
let is_2021 = contents.lines().any(is_edition_2021);
22+
if !is_2021 {
23+
tidy_error!(
24+
bad,
25+
"{} doesn't have `edition = \"2021\"` on a separate line",
26+
file.display()
27+
);
4728
}
4829
},
4930
);

0 commit comments

Comments
 (0)