languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-02 06:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #92068 - fee1-dead:libcore2021, r=m-ou-se

Browse source 
Switch all libraries to the 2021 edition

The fix for https://github.com/rust-lang/rust/issues/88638#issuecomment-996620107 is to simply add const-stability for these functions.

r? `@m-ou-se`

Closes #88638.
This commit is contained in:
bors 2022-01-08 21:41:48 +00:00
parent a7e2e33960 3ae0dabddb
commit 23ce5fc465
20 changed files with 22 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/alloc/Cargo.toml
View file

@ -6,7 +6,7 @@ repository = "https://github.com/rust-lang/rust.git"
description = "The Rust core allocation and collections library" description = "The Rust core allocation and collections library"
autotests = false autotests = false
autobenches = false autobenches = false
edition = "2018" edition = "2021"
[dependencies] [dependencies]
core = { path = "../core" } core = { path = "../core" }

3
library/alloc/src/vec/mod.rs
View file

@ -3004,14 +3004,12 @@ fn from(s: &str) -> Vec<u8> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
/// assert_eq!(vec![1, 2, 3].try_into(), Ok([1, 2, 3])); /// assert_eq!(vec![1, 2, 3].try_into(), Ok([1, 2, 3]));
/// assert_eq!(<Vec<i32>>::new().try_into(), Ok([])); /// assert_eq!(<Vec<i32>>::new().try_into(), Ok([]));
/// ``` /// ```
/// ///
/// If the length doesn't match, the input comes back in `Err`: /// If the length doesn't match, the input comes back in `Err`:
/// ``` /// ```
/// use std::convert::TryInto;
/// let r: Result<[i32; 4], _> = (0..10).collect::<Vec<_>>().try_into(); /// let r: Result<[i32; 4], _> = (0..10).collect::<Vec<_>>().try_into();
/// assert_eq!(r, Err(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9])); /// assert_eq!(r, Err(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9]));
/// ``` /// ```
@ -3019,7 +3017,6 @@ fn from(s: &str) -> Vec<u8> {
/// If you're fine with just getting a prefix of the `Vec<T>`, /// If you're fine with just getting a prefix of the `Vec<T>`,
/// you can call [`.truncate(N)`](Vec::truncate) first. /// you can call [`.truncate(N)`](Vec::truncate) first.
/// ``` /// ```
/// use std::convert::TryInto;
/// let mut v = String::from("hello world").into_bytes(); /// let mut v = String::from("hello world").into_bytes();
/// v.sort(); /// v.sort();
/// v.truncate(2); /// v.truncate(2);

2
library/core/Cargo.toml
View file

@ -6,7 +6,7 @@ repository = "https://github.com/rust-lang/rust.git"
description = "The Rust Core Library" description = "The Rust Core Library"
autotests = false autotests = false
autobenches = false autobenches = false
edition = "2018" edition = "2021"
[lib] [lib]
test = false test = false

2
library/core/src/array/mod.rs
View file

@ -66,8 +66,6 @@
/// ///
/// ```rust /// ```rust
/// #![feature(array_from_fn)] /// #![feature(array_from_fn)]
/// # // Apparently these doc tests are still on edition2018
/// # use std::convert::TryInto;
/// ///
/// let array: Result<[u8; 5], _> = std::array::try_from_fn(|i| i.try_into()); /// let array: Result<[u8; 5], _> = std::array::try_from_fn(|i| i.try_into());
/// assert_eq!(array, Ok([0, 1, 2, 3, 4])); /// assert_eq!(array, Ok([0, 1, 2, 3, 4]));

4
library/core/src/convert/mod.rs
View file

@ -426,8 +426,6 @@ pub trait TryInto<T>: Sized {
/// `TryFrom<T>` can be implemented as follows: /// `TryFrom<T>` can be implemented as follows:
/// ///
/// ``` /// ```
/// use std::convert::TryFrom;
///
/// struct GreaterThanZero(i32); /// struct GreaterThanZero(i32);
/// ///
/// impl TryFrom<i32> for GreaterThanZero { /// impl TryFrom<i32> for GreaterThanZero {
@ -448,8 +446,6 @@ pub trait TryInto<T>: Sized {
/// As described, [`i32`] implements `TryFrom<`[`i64`]`>`: /// As described, [`i32`] implements `TryFrom<`[`i64`]`>`:
/// ///
/// ``` /// ```
/// use std::convert::TryFrom;
///
/// let big_number = 1_000_000_000_000i64; /// let big_number = 1_000_000_000_000i64;
/// // Silently truncates `big_number`, requires detecting /// // Silently truncates `big_number`, requires detecting
/// // and handling the truncation after the fact. /// // and handling the truncation after the fact.

6
library/core/src/iter/traits/collect.rs
View file

@ -15,8 +15,6 @@
/// Basic usage: /// Basic usage:
/// ///
/// ``` /// ```
/// use std::iter::FromIterator;
///
/// let five_fives = std::iter::repeat(5).take(5); /// let five_fives = std::iter::repeat(5).take(5);
/// ///
/// let v = Vec::from_iter(five_fives); /// let v = Vec::from_iter(five_fives);
@ -37,8 +35,6 @@
/// Implementing `FromIterator` for your type: /// Implementing `FromIterator` for your type:
/// ///
/// ``` /// ```
/// use std::iter::FromIterator;
///
/// // A sample collection, that's just a wrapper over Vec<T> /// // A sample collection, that's just a wrapper over Vec<T>
/// #[derive(Debug)] /// #[derive(Debug)]
/// struct MyCollection(Vec<i32>); /// struct MyCollection(Vec<i32>);
@ -102,8 +98,6 @@ pub trait FromIterator<A>: Sized {
/// Basic usage: /// Basic usage:
/// ///
/// ``` /// ```
/// use std::iter::FromIterator;
///
/// let five_fives = std::iter::repeat(5).take(5); /// let five_fives = std::iter::repeat(5).take(5);
/// ///
/// let v = Vec::from_iter(five_fives); /// let v = Vec::from_iter(five_fives);

4
library/core/src/iter/traits/iterator.rs
View file

@ -1155,8 +1155,6 @@ fn take_while<P>(self, predicate: P) -> TakeWhile<Self, P>
/// Stopping after an initial [`None`]: /// Stopping after an initial [`None`]:
/// ///
/// ``` /// ```
/// use std::convert::TryFrom;
///
/// let a = [0, 1, 2, -3, 4, 5, -6]; /// let a = [0, 1, 2, -3, 4, 5, -6];
/// ///
/// let iter = a.iter().map_while(|x| u32::try_from(*x).ok()); /// let iter = a.iter().map_while(|x| u32::try_from(*x).ok());
@ -1172,8 +1170,6 @@ fn take_while<P>(self, predicate: P) -> TakeWhile<Self, P>
/// removed: /// removed:
/// ///
/// ``` /// ```
/// use std::convert::TryFrom;
///
/// let a = [1, 2, -3, 4]; /// let a = [1, 2, -3, 4];
/// let mut iter = a.iter(); /// let mut iter = a.iter();
/// ///

6
library/core/src/num/int_macros.rs
View file

@ -2602,8 +2602,6 @@ pub const fn is_negative(self) -> bool { self < 0 }
/// When starting from a slice rather than an array, fallible conversion APIs can be used: /// When starting from a slice rather than an array, fallible conversion APIs can be used:
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
///
#[doc = concat!("fn read_be_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")] #[doc = concat!("fn read_be_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")] #[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
/// *input = rest; /// *input = rest;
@ -2633,8 +2631,6 @@ pub const fn is_negative(self) -> bool { self < 0 }
/// When starting from a slice rather than an array, fallible conversion APIs can be used: /// When starting from a slice rather than an array, fallible conversion APIs can be used:
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
///
#[doc = concat!("fn read_le_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")] #[doc = concat!("fn read_le_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")] #[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
/// *input = rest; /// *input = rest;
@ -2675,8 +2671,6 @@ pub const fn is_negative(self) -> bool { self < 0 }
/// When starting from a slice rather than an array, fallible conversion APIs can be used: /// When starting from a slice rather than an array, fallible conversion APIs can be used:
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
///
#[doc = concat!("fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")] #[doc = concat!("fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")] #[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
/// *input = rest; /// *input = rest;

6
library/core/src/num/uint_macros.rs
View file

@ -2323,8 +2323,6 @@ pub const fn wrapping_next_power_of_two(self) -> Self {
/// When starting from a slice rather than an array, fallible conversion APIs can be used: /// When starting from a slice rather than an array, fallible conversion APIs can be used:
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
///
#[doc = concat!("fn read_be_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")] #[doc = concat!("fn read_be_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")] #[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
/// *input = rest; /// *input = rest;
@ -2354,8 +2352,6 @@ pub const fn wrapping_next_power_of_two(self) -> Self {
/// When starting from a slice rather than an array, fallible conversion APIs can be used: /// When starting from a slice rather than an array, fallible conversion APIs can be used:
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
///
#[doc = concat!("fn read_le_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")] #[doc = concat!("fn read_le_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")] #[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
/// *input = rest; /// *input = rest;
@ -2396,8 +2392,6 @@ pub const fn wrapping_next_power_of_two(self) -> Self {
/// When starting from a slice rather than an array, fallible conversion APIs can be used: /// When starting from a slice rather than an array, fallible conversion APIs can be used:
/// ///
/// ``` /// ```
/// use std::convert::TryInto;
///
#[doc = concat!("fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")] #[doc = concat!("fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT), " {")]
#[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")] #[doc = concat!(" let (int_bytes, rest) = input.split_at(std::mem::size_of::<", stringify!($SelfT), ">());")]
/// *input = rest; /// *input = rest;

4
library/core/src/panicking.rs
View file

@ -51,6 +51,7 @@ pub const fn panic(expr: &'static str) -> ! {
#[inline] #[inline]
#[track_caller] #[track_caller]
#[lang = "panic_str"] // needed for `non-fmt-panics` lint #[lang = "panic_str"] // needed for `non-fmt-panics` lint
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn panic_str(expr: &str) -> ! { pub const fn panic_str(expr: &str) -> ! {
panic_display(&expr); panic_display(&expr);
} }
@ -59,6 +60,7 @@ pub const fn panic_str(expr: &str) -> ! {
#[track_caller] #[track_caller]
#[lang = "panic_display"] // needed for const-evaluated panics #[lang = "panic_display"] // needed for const-evaluated panics
#[rustc_do_not_const_check] // hooked by const-eval #[rustc_do_not_const_check] // hooked by const-eval
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn panic_display<T: fmt::Display>(x: &T) -> ! { pub const fn panic_display<T: fmt::Display>(x: &T) -> ! {
panic_fmt(format_args!("{}", *x)); panic_fmt(format_args!("{}", *x));
} }
@ -89,6 +91,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
#[track_caller] #[track_caller]
#[lang = "panic_fmt"] // needed for const-evaluated panics #[lang = "panic_fmt"] // needed for const-evaluated panics
#[rustc_do_not_const_check] // hooked by const-eval #[rustc_do_not_const_check] // hooked by const-eval
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! { pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
if cfg!(feature = "panic_immediate_abort") { if cfg!(feature = "panic_immediate_abort") {
super::intrinsics::abort() super::intrinsics::abort()
@ -109,6 +112,7 @@ pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
/// This function is used instead of panic_fmt in const eval. /// This function is used instead of panic_fmt in const eval.
#[lang = "const_panic_fmt"] #[lang = "const_panic_fmt"]
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn const_panic_fmt(fmt: fmt::Arguments<'_>) -> ! { pub const fn const_panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
if let Some(msg) = fmt.as_str() { if let Some(msg) = fmt.as_str() {
panic_str(msg); panic_str(msg);

2
library/panic_abort/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.0.0"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust.git" repository = "https://github.com/rust-lang/rust.git"
description = "Implementation of Rust panics via process aborts" description = "Implementation of Rust panics via process aborts"
edition = "2018" edition = "2021"
[lib] [lib]
test = false test = false

2
library/panic_unwind/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.0.0"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust.git" repository = "https://github.com/rust-lang/rust.git"
description = "Implementation of Rust panics via stack unwinding" description = "Implementation of Rust panics via stack unwinding"
edition = "2018" edition = "2021"
[lib] [lib]
test = false test = false

2
library/proc_macro/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "proc_macro" name = "proc_macro"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2021"
[dependencies] [dependencies]
std = { path = "../std" } std = { path = "../std" }

2
library/profiler_builtins/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "profiler_builtins" name = "profiler_builtins"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2021"
[lib] [lib]
test = false test = false

2
library/rustc-std-workspace-alloc/Cargo.toml
View file

@ -5,7 +5,7 @@ license = 'MIT OR Apache-2.0'
description = """ description = """
Hack for the compiler's own build system Hack for the compiler's own build system
""" """
edition = "2018" edition = "2021"
[lib] [lib]
path = "lib.rs" path = "lib.rs"

2
library/rustc-std-workspace-core/Cargo.toml
View file

@ -5,7 +5,7 @@ license = 'MIT OR Apache-2.0'
description = """ description = """
Hack for the compiler's own build system Hack for the compiler's own build system
""" """
edition = "2018" edition = "2021"
[lib] [lib]
path = "lib.rs" path = "lib.rs"

2
library/rustc-std-workspace-std/Cargo.toml
View file

@ -5,7 +5,7 @@ license = 'MIT OR Apache-2.0'
description = """ description = """
Hack for the compiler's own build system Hack for the compiler's own build system
""" """
edition = "2018" edition = "2021"
[lib] [lib]
path = "lib.rs" path = "lib.rs"

2
library/test/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "test" name = "test"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2021"
[lib] [lib]
crate-type = ["dylib", "rlib"] crate-type = ["dylib", "rlib"]

2
library/unwind/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "unwind"
version = "0.0.0" version = "0.0.0"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust.git" repository = "https://github.com/rust-lang/rust.git"
edition = "2018" edition = "2021"
include = [ include = [
'/libunwind/*', '/libunwind/*',
] ]

33
src/tools/tidy/src/edition.rs
View file

@ -2,11 +2,6 @@
use std::path::Path; use std::path::Path;
fn is_edition_2018(mut line: &str) -> bool {
line = line.trim();
line == "edition = \"2018\""
}
fn is_edition_2021(mut line: &str) -> bool { fn is_edition_2021(mut line: &str) -> bool {
line = line.trim(); line = line.trim();
line == "edition = \"2021\"" line == "edition = \"2021\""
@ -23,27 +18,13 @@ pub fn check(path: &Path, bad: &mut bool) {
return; return;
} }
// Not all library crates are ready to migrate to 2021. let is_2021 = contents.lines().any(is_edition_2021);
if file.components().any(|c| c.as_os_str() == "library") if !is_2021 {
&& file.components().all(|c| c.as_os_str() != "std") tidy_error!(
{ bad,
let has = contents.lines().any(is_edition_2018); "{} doesn't have `edition = \"2021\"` on a separate line",
if !has { file.display()
tidy_error!( );
bad,
"{} doesn't have `edition = \"2018\"` on a separate line",
file.display()
);
}
} else {
let is_2021 = contents.lines().any(is_edition_2021);
if !is_2021 {
tidy_error!(
bad,
"{} doesn't have `edition = \"2021\"` on a separate line",
file.display()
);
}
} }
}, },
); );