Rollup merge of #96861 - m-ou-se:std-use-prelude-2021, r=joshtriplett

Use Rust 2021 prelude in std itself.

Author: JohnTitor

library/std/src/collections/hash/map.rs

@@ -12,7 +12,7 @@ use crate::collections::TryReserveErrorKind;
 use crate::fmt::{self, Debug};
 #[allow(deprecated)]
 use crate::hash::{BuildHasher, Hash, Hasher, SipHasher13};
-use crate::iter::{FromIterator, FusedIterator};
+use crate::iter::FusedIterator;
 use crate::ops::Index;
 use crate::sys;
 

library/std/src/collections/hash/set.rs

@@ -7,7 +7,7 @@ use crate::borrow::Borrow;
 use crate::collections::TryReserveError;
 use crate::fmt;
 use crate::hash::{BuildHasher, Hash};
-use crate::iter::{Chain, FromIterator, FusedIterator};
+use crate::iter::{Chain, FusedIterator};
 use crate::ops::{BitAnd, BitOr, BitXor, Sub};
 
 use super::map::{map_try_reserve_error, RandomState};

library/std/src/ffi/os_str.rs

@@ -6,7 +6,7 @@ use crate::cmp;
 use crate::collections::TryReserveError;
 use crate::fmt;
 use crate::hash::{Hash, Hasher};
-use crate::iter::{Extend, FromIterator};
+use crate::iter::Extend;
 use crate::ops;
 use crate::rc::Rc;
 use crate::str::FromStr;

library/std/src/io/cursor.rs

@@ -7,8 +7,6 @@ use crate::alloc::Allocator;
 use crate::cmp;
 use crate::io::{self, ErrorKind, IoSlice, IoSliceMut, ReadBuf, SeekFrom};
 
-use core::convert::TryInto;
-
 /// A `Cursor` wraps an in-memory buffer and provides it with a
 /// [`Seek`] implementation.
 ///

library/std/src/io/mod.rs

@@ -252,7 +252,6 @@
 mod tests;
 
 use crate::cmp;
-use crate::convert::TryInto;
 use crate::fmt;
 use crate::mem::replace;
 use crate::ops::{Deref, DerefMut};

library/std/src/lib.rs

@@ -343,7 +343,7 @@
 // to import the prelude implicitly when building crates that depend on std.
 #[prelude_import]
 #[allow(unused)]
-use prelude::v1::*;
+use prelude::rust_2021::*;
 
 // Access to Bencher, etc.
 #[cfg(test)]

library/std/src/net/addr.rs

@@ -2,7 +2,6 @@
 mod tests;
 
 use crate::cmp::Ordering;
-use crate::convert::TryInto;
 use crate::fmt;
 use crate::hash;
 use crate::io::{self, Write};

library/std/src/net/parser.rs

@@ -6,7 +6,6 @@
 #[cfg(test)]
 mod tests;
 
-use crate::convert::TryInto as _;
 use crate::error::Error;
 use crate::fmt;
 use crate::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};

library/std/src/os/unix/net/ancillary.rs

@@ -1,5 +1,4 @@
 use super::{sockaddr_un, SocketAddr};
-use crate::convert::TryFrom;
 use crate::io::{self, IoSlice, IoSliceMut};
 use crate::marker::PhantomData;
 use crate::mem::{size_of, zeroed};

library/std/src/os/unix/net/tests.rs

@@ -10,7 +10,6 @@ use crate::io::{self, ErrorKind, IoSlice, IoSliceMut};
     target_os = "netbsd",
     target_os = "openbsd",
 ))]
-use crate::iter::FromIterator;
 #[cfg(any(
     target_os = "android",
     target_os = "dragonfly",