Remove redundant imports of size_of

Author: joshtriplett

compiler/rustc_middle/src/query/erase.rs

@@ -4,7 +4,7 @@ use crate::traits;
 use crate::ty::adjustment::CoerceUnsizedInfo;
 use crate::ty::{self, Ty};
 use std::intrinsics::transmute_unchecked;
-use std::mem::{size_of, MaybeUninit};
+use std::mem::MaybeUninit;
 
 #[derive(Copy, Clone)]
 pub struct Erased<T: Copy> {

library/alloc/tests/thin_box.rs

@@ -1,4 +1,5 @@
 use core::fmt::Debug;
+#[cfg(bootstrap)]
 use core::mem::size_of;
 use std::boxed::ThinBox;
 

library/alloc/tests/vec.rs

@@ -11,7 +11,9 @@ use std::fmt::Debug;
 use std::hint;
 use std::iter::InPlaceIterable;
 use std::mem;
-use std::mem::{size_of, swap};
+#[cfg(bootstrap)]
+use std::mem::size_of;
+use std::mem::swap;
 use std::ops::Bound::*;
 use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::rc::Rc;

library/core/tests/alloc.rs

@@ -1,4 +1,5 @@
 use core::alloc::Layout;
+#[cfg(bootstrap)]
 use core::mem::size_of;
 use core::ptr::{self, NonNull};
 

library/core/tests/nonzero.rs

@@ -1,5 +1,6 @@
 use core::num::{IntErrorKind, NonZero};
 use core::option::Option::None;
+#[cfg(bootstrap)]
 use std::mem::size_of;
 
 #[test]

library/proc_macro/src/bridge/fxhash.rs

@@ -7,7 +7,6 @@
 use std::collections::HashMap;
 use std::hash::BuildHasherDefault;
 use std::hash::Hasher;
-use std::mem::size_of;
 use std::ops::BitXor;
 
 /// Type alias for a hashmap using the `fx` hash algorithm.

library/std/src/io/error/repr_bitpacked.rs

@@ -104,7 +104,9 @@
 
 use super::{Custom, ErrorData, ErrorKind, RawOsError, SimpleMessage};
 use core::marker::PhantomData;
-use core::mem::{align_of, size_of};
+use core::mem::align_of;
+#[cfg(bootstrap)]
+use core::mem::size_of;
 use core::ptr::{self, NonNull};
 
 // The 2 least-significant bits are used as tag.

library/std/src/io/error/tests.rs

@@ -2,6 +2,7 @@ use super::{const_io_error, Custom, Error, ErrorData, ErrorKind, Repr, SimpleMes
 use crate::assert_matches::assert_matches;
 use crate::error;
 use crate::fmt;
+#[cfg(bootstrap)]
 use crate::mem::size_of;
 use crate::sys::decode_error_kind;
 use crate::sys::os::error_string;

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

@@ -3,7 +3,9 @@
 use super::{sockaddr_un, SocketAddr};
 use crate::io::{self, IoSlice, IoSliceMut};
 use crate::marker::PhantomData;
-use crate::mem::{size_of, zeroed};
+#[cfg(bootstrap)]
+use crate::mem::size_of;
+use crate::mem::zeroed;
 use crate::os::unix::io::RawFd;
 use crate::path::Path;
 use crate::ptr::{eq, read_unaligned};