Import fixes.

Author: lygstate

library/alloc/src/io/buffered/bufreader.rs

@@ -1,6 +1,7 @@
-use crate::cmp;
+use core::cmp;
 use crate::fmt;
 use crate::io::{self, BufRead, Initializer, IoSliceMut, Read, Seek, SeekFrom, DEFAULT_BUF_SIZE};
+use crate::{boxed::Box, vec::Vec};
 
 /// The `BufReader<R>` struct adds buffering to any reader.
 ///

library/alloc/src/io/buffered/bufwriter.rs

@@ -2,6 +2,7 @@ use crate::fmt;
 use crate::io::{
     self, Error, ErrorKind, IntoInnerError, IoSlice, Seek, SeekFrom, Write, DEFAULT_BUF_SIZE,
 };
+use crate::vec::Vec;
 
 /// Wraps a writer and buffers its output.
 ///

library/alloc/src/io/buffered/linewritershim.rs

@@ -1,5 +1,5 @@
 use crate::io::{self, BufWriter, IoSlice, Write};
-use crate::memchr;
+use core::slice::memchr;
 
 /// Private helper struct for implementing the line-buffered writing logic.
 /// This shim temporarily wraps a BufWriter, and uses its internals to

library/alloc/src/io/buffered/mod.rs

@@ -8,7 +8,6 @@ mod linewritershim;
 #[cfg(test)]
 mod tests;
 
-use crate::error;
 use crate::fmt;
 use crate::io::Error;
 

library/alloc/src/io/cursor.rs

@@ -3,10 +3,11 @@ mod tests;
 
 use crate::io::prelude::*;
 
-use crate::cmp;
+use core::cmp;
 use crate::io::{self, Error, ErrorKind, Initializer, IoSlice, IoSliceMut, SeekFrom};
 
 use core::convert::TryInto;
+use crate::{vec::Vec, boxed::Box};
 
 /// A `Cursor` wraps an in-memory buffer and provides it with a
 /// [`Seek`] implementation.

library/alloc/src/io/error.rs

@@ -1,11 +1,10 @@
 #[cfg(test)]
 mod tests;
 
-use crate::convert::From;
-use crate::error;
-use crate::fmt;
-use crate::result;
-use crate::sys;
+use core::convert::From;
+use core::fmt;
+use core::result;
+use crate::{boxed::Box, string::String};
 
 /// A specialized [`Result`] type for I/O operations.
 ///

library/alloc/src/io/impls.rs

@@ -1,12 +1,13 @@
 #[cfg(test)]
 mod tests;
 
-use crate::cmp;
-use crate::fmt;
+use core::cmp;
+use core::fmt;
 use crate::io::{
     self, BufRead, Error, ErrorKind, Initializer, IoSlice, IoSliceMut, Read, Seek, SeekFrom, Write,
 };
-use crate::mem;
+use core::mem;
+use crate::{vec::Vec, boxed::Box, string::String};
 
 // =============================================================================
 // Forwarding implementations

library/alloc/src/io/mod.rs

@@ -249,17 +249,19 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
+use core::{marker::PhantomData};
+use core::ctypes::{c_void, iovec, iov_len_t};
+
 #[cfg(test)]
 mod tests;
 
-use crate::cmp;
-use crate::fmt;
-use crate::memchr;
-use crate::ops::{Deref, DerefMut};
-use crate::ptr;
-use crate::slice;
-use crate::str;
-use crate::sys;
+use core::cmp;
+use core::fmt;
+use core::slice::memchr;
+use core::ops::{Deref, DerefMut};
+use core::ptr;
+use core::slice;
+use core::str;
 
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::buffered::IntoInnerError;
@@ -270,24 +272,15 @@ pub use self::cursor::Cursor;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::error::{Error, ErrorKind, Result};
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use self::stdio::{stderr, stdin, stdout, Stderr, Stdin, Stdout};
-#[stable(feature = "rust1", since = "1.0.0")]
-pub use self::stdio::{StderrLock, StdinLock, StdoutLock};
-#[unstable(feature = "print_internals", issue = "none")]
-pub use self::stdio::{_eprint, _print};
-#[unstable(feature = "libstd_io_internals", issue = "42788")]
-#[doc(no_inline, hidden)]
-pub use self::stdio::{set_panic, set_print};
-#[stable(feature = "rust1", since = "1.0.0")]
 pub use self::util::{copy, empty, repeat, sink, Empty, Repeat, Sink};
 
 mod buffered;
 mod cursor;
 mod error;
 mod impls;
 pub mod prelude;
-mod stdio;
 mod util;
+use crate::{vec::Vec, string::String};
 
 const DEFAULT_BUF_SIZE: usize = crate::sys_common::io::DEFAULT_BUF_SIZE;
 

library/alloc/src/io/util.rs

@@ -3,9 +3,9 @@
 #[cfg(test)]
 mod tests;
 
-use crate::fmt;
+use core::fmt;
 use crate::io::{self, BufRead, ErrorKind, Initializer, IoSlice, IoSliceMut, Read, Write};
-use crate::mem::MaybeUninit;
+use core::mem::MaybeUninit;
 
 /// Copies the entire contents of a reader into a writer.
 ///

library/alloc/src/lib.rs

@@ -114,6 +114,8 @@
 #![feature(or_patterns)]
 #![feature(pattern)]
 #![feature(ptr_internals)]
+#![feature(slice_internals)]
+#![feature(doc_spotlight)]
 #![feature(raw_ref_op)]
 #![feature(rustc_attrs)]
 #![feature(receiver_trait)]
@@ -180,6 +182,7 @@ pub mod task;
 #[cfg(test)]
 mod tests;
 pub mod vec;
+pub mod io;
 
 #[cfg(not(test))]
 mod std {