mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch all libraries to the 2021 edition

Browse Source
This commit is contained in:
Deadbeef 2021-12-17 21:53:28 +08:00
parent f52eb4ca8b
commit 06a1c14d52
No known key found for this signature in database
GPG Key ID: 6D017A96D8E6C2F9
18 changed files with 18 additions and 65 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"
autotests = false
autobenches = false
edition = "2018"
edition = "2021"
[dependencies]
core = { path = "../core" }

2
library/core/Cargo.toml
View File

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

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

@ -66,8 +66,6 @@
///
/// ```rust
/// #![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());
/// 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:
///
/// ```
/// use std::convert::TryFrom;
///
/// struct GreaterThanZero(i32);
///
/// impl TryFrom<i32> for GreaterThanZero {
@ -448,8 +446,6 @@ pub trait TryInto<T>: Sized {
/// As described, [`i32`] implements `TryFrom<`[`i64`]`>`:
///
/// ```
/// use std::convert::TryFrom;
///
/// let big_number = 1_000_000_000_000i64;
/// // Silently truncates `big_number`, requires detecting
/// // and handling the truncation after the fact.

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

@ -15,8 +15,6 @@
/// Basic usage:
///
/// ```
/// use std::iter::FromIterator;
///
/// let five_fives = std::iter::repeat(5).take(5);
///
/// let v = Vec::from_iter(five_fives);
@ -37,8 +35,6 @@
/// Implementing `FromIterator` for your type:
///
/// ```
/// use std::iter::FromIterator;
///
/// // A sample collection, that's just a wrapper over Vec<T>
/// #[derive(Debug)]
/// struct MyCollection(Vec<i32>);
@ -102,8 +98,6 @@ pub trait FromIterator<A>: Sized {
/// Basic usage:
///
/// ```
/// use std::iter::FromIterator;
///
/// let five_fives = std::iter::repeat(5).take(5);
///
/// 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`]:
///
/// ```
/// use std::convert::TryFrom;
///
/// let a = [0, 1, 2, -3, 4, 5, -6];
///
/// 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:
///
/// ```
/// use std::convert::TryFrom;
///
/// let a = [1, 2, -3, 4];
/// 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:
///
/// ```
/// use std::convert::TryInto;
///
#[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), ">());")]
/// *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:
///
/// ```
/// use std::convert::TryInto;
///
#[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), ">());")]
/// *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:
///
/// ```
/// use std::convert::TryInto;
///
#[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), ">());")]
/// *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:
///
/// ```
/// use std::convert::TryInto;
///
#[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), ">());")]
/// *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:
///
/// ```
/// use std::convert::TryInto;
///
#[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), ">());")]
/// *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:
///
/// ```
/// use std::convert::TryInto;
///
#[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), ">());")]
/// *input = rest;

2
library/panic_abort/Cargo.toml
View File

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

2
library/panic_unwind/Cargo.toml
View File

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

2
library/proc_macro/Cargo.toml
View File

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

2
library/profiler_builtins/Cargo.toml
View File

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

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

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

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

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

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

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

2
library/test/Cargo.toml
View File

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

2
library/unwind/Cargo.toml
View File

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

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

@ -2,11 +2,6 @@
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 {
line = line.trim();
line == "edition = \"2021\""
@ -23,27 +18,13 @@ pub fn check(path: &Path, bad: &mut bool) {
return;
}
// Not all library crates are ready to migrate to 2021.
if file.components().any(|c| c.as_os_str() == "library")
&& file.components().all(|c| c.as_os_str() != "std")
{
let has = contents.lines().any(is_edition_2018);
if !has {
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()
);
}
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()
);
}
},
);