From 7d4942760bcbf33d6a79540a27f1e1373d7fa627 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Fri, 5 Mar 2021 13:24:26 +0100 Subject: [PATCH 1/3] Update to latest minifier release --- Cargo.lock | 4 ++-- src/librustdoc/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9e773c572cc41..4d05f9dd80daa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2214,9 +2214,9 @@ dependencies = [ [[package]] name = "minifier" -version = "0.0.33" +version = "0.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf0db2475f5e627787da77ca52fe33c294063f49f4134b8bc662eedb5e7332" +checksum = "6cdf618de5c9c98d4a7b2e0d1f1e44f82a19196cfd94040bb203621c25d28d98" dependencies = [ "macro-utils", ] diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 44c2c3b17860b..9084a1713cb05 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" [dependencies] arrayvec = { version = "0.5.1", default-features = false } pulldown-cmark = { version = "0.8", default-features = false } -minifier = "0.0.33" +minifier = "0.0.39" rayon = { version = "0.3.0", package = "rustc-rayon" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" From 668ebf198990988d3bedae1978772f34911878c8 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Thu, 4 Mar 2021 23:20:07 +0100 Subject: [PATCH 2/3] Add TryFrom, TryInto, FromIterator to the v1 prelude --- library/core/src/prelude/v1.rs | 6 ++++++ library/std/src/prelude/v1.rs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/library/core/src/prelude/v1.rs b/library/core/src/prelude/v1.rs index a1fbd8dec7505..29beb2fbc443a 100644 --- a/library/core/src/prelude/v1.rs +++ b/library/core/src/prelude/v1.rs @@ -29,9 +29,15 @@ pub use crate::cmp::{Eq, Ord, PartialEq, PartialOrd}; #[stable(feature = "core_prelude", since = "1.4.0")] #[doc(no_inline)] pub use crate::convert::{AsMut, AsRef, From, Into}; +#[stable(feature = "edition_2021_prelude", since = "1.50.0")] +#[doc(no_inline)] +pub use crate::convert::{TryFrom, TryInto}; #[stable(feature = "core_prelude", since = "1.4.0")] #[doc(no_inline)] pub use crate::default::Default; +#[stable(feature = "edition_2021_prelude", since = "1.50.0")] +#[doc(no_inline)] +pub use crate::iter::FromIterator; #[stable(feature = "core_prelude", since = "1.4.0")] #[doc(no_inline)] pub use crate::iter::{DoubleEndedIterator, ExactSizeIterator}; diff --git a/library/std/src/prelude/v1.rs b/library/std/src/prelude/v1.rs index ef9aec54a4ca2..8b7e34f203e1f 100644 --- a/library/std/src/prelude/v1.rs +++ b/library/std/src/prelude/v1.rs @@ -21,6 +21,12 @@ pub use crate::mem::drop; #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use crate::convert::{AsMut, AsRef, From, Into}; +#[stable(feature = "edition_2021_prelude", since = "1.50.0")] +#[doc(no_inline)] +pub use crate::convert::{TryFrom, TryInto}; +#[stable(feature = "edition_2021_prelude", since = "1.50.0")] +#[doc(no_inline)] +pub use crate::iter::FromIterator; #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use crate::iter::{DoubleEndedIterator, ExactSizeIterator}; From a47eecdb9b29f934fa419daaadbff4167072c952 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 15 Mar 2021 21:49:55 +0100 Subject: [PATCH 3/3] Remove unnecessary import from doctests --- library/alloc/src/vec/mod.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 0028e290fac4e..8d4fc826ae67a 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -2696,14 +2696,12 @@ impl TryFrom> for [T; N] { /// # Examples /// /// ``` - /// use std::convert::TryInto; /// assert_eq!(vec![1, 2, 3].try_into(), Ok([1, 2, 3])); /// assert_eq!(>::new().try_into(), Ok([])); /// ``` /// /// If the length doesn't match, the input comes back in `Err`: /// ``` - /// use std::convert::TryInto; /// let r: Result<[i32; 4], _> = (0..10).collect::>().try_into(); /// assert_eq!(r, Err(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9])); /// ``` @@ -2711,7 +2709,6 @@ impl TryFrom> for [T; N] { /// If you're fine with just getting a prefix of the `Vec`, /// you can call [`.truncate(N)`](Vec::truncate) first. /// ``` - /// use std::convert::TryInto; /// let mut v = String::from("hello world").into_bytes(); /// v.sort(); /// v.truncate(2);