| 
12 | 12 | //!  | 
13 | 13 | //! See the [module-level documentation](../index.html) for more.  | 
14 | 14 | 
  | 
 | 15 | + | 
 | 16 | + | 
15 | 17 | #![stable(feature = "rust1", since = "1.0.0")]  | 
16 | 18 | 
 
  | 
17 | 19 | // Re-exported core operators  | 
18 | 20 | #[stable(feature = "rust1", since = "1.0.0")]  | 
19 |  | -#[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync};  | 
 | 21 | +#[doc(no_inline)]  | 
 | 22 | +pub use marker::{Copy, Send, Sized, Sync};  | 
20 | 23 | #[stable(feature = "rust1", since = "1.0.0")]  | 
21 |  | -#[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce};  | 
 | 24 | +#[doc(no_inline)]  | 
 | 25 | +pub use ops::{Drop, Fn, FnMut, FnOnce};  | 
22 | 26 | 
 
  | 
23 | 27 | // Re-exported functions  | 
24 | 28 | #[stable(feature = "rust1", since = "1.0.0")]  | 
25 |  | -#[doc(no_inline)] pub use mem::drop;  | 
 | 29 | +#[doc(no_inline)]  | 
 | 30 | +pub use mem::drop;  | 
26 | 31 | 
 
  | 
27 | 32 | // Re-exported types and traits  | 
28 | 33 | #[stable(feature = "rust1", since = "1.0.0")]  | 
29 |  | -#[doc(no_inline)] pub use boxed::Box;  | 
 | 34 | +#[doc(no_inline)]  | 
 | 35 | +pub use clone::Clone;  | 
30 | 36 | #[stable(feature = "rust1", since = "1.0.0")]  | 
31 |  | -#[doc(no_inline)] pub use borrow::ToOwned;  | 
 | 37 | +#[doc(no_inline)]  | 
 | 38 | +pub use cmp::{PartialEq, PartialOrd, Eq, Ord};  | 
32 | 39 | #[stable(feature = "rust1", since = "1.0.0")]  | 
33 |  | -#[doc(no_inline)] pub use clone::Clone;  | 
 | 40 | +#[doc(no_inline)]  | 
 | 41 | +pub use convert::{AsRef, AsMut, Into, From};  | 
34 | 42 | #[stable(feature = "rust1", since = "1.0.0")]  | 
35 |  | -#[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord};  | 
 | 43 | +#[doc(no_inline)]  | 
 | 44 | +pub use default::Default;  | 
36 | 45 | #[stable(feature = "rust1", since = "1.0.0")]  | 
37 |  | -#[doc(no_inline)] pub use convert::{AsRef, AsMut, Into, From};  | 
 | 46 | +#[doc(no_inline)]  | 
 | 47 | +pub use iter::{Iterator, Extend, IntoIterator};  | 
38 | 48 | #[stable(feature = "rust1", since = "1.0.0")]  | 
39 |  | -#[doc(no_inline)] pub use default::Default;  | 
 | 49 | +#[doc(no_inline)]  | 
 | 50 | +pub use iter::{DoubleEndedIterator, ExactSizeIterator};  | 
40 | 51 | #[stable(feature = "rust1", since = "1.0.0")]  | 
41 |  | -#[doc(no_inline)] pub use iter::{Iterator, Extend, IntoIterator};  | 
 | 52 | +#[doc(no_inline)]  | 
 | 53 | +pub use option::Option::{self, Some, None};  | 
42 | 54 | #[stable(feature = "rust1", since = "1.0.0")]  | 
43 |  | -#[doc(no_inline)] pub use iter::{DoubleEndedIterator, ExactSizeIterator};  | 
 | 55 | +#[doc(no_inline)]  | 
 | 56 | +pub use result::Result::{self, Ok, Err};  | 
 | 57 | + | 
 | 58 | + | 
 | 59 | +// The file so far is equivalent to src/libcore/prelude/v1.rs,  | 
 | 60 | +// and below to src/liballoc/prelude.rs.  | 
 | 61 | +// Those files are duplicated rather than using glob imports  | 
 | 62 | +// because we want docs to show these re-exports as pointing to within `std`.  | 
 | 63 | + | 
 | 64 | + | 
44 | 65 | #[stable(feature = "rust1", since = "1.0.0")]  | 
45 |  | -#[doc(no_inline)] pub use option::Option::{self, Some, None};  | 
 | 66 | +#[doc(no_inline)]  | 
 | 67 | +pub use boxed::Box;  | 
46 | 68 | #[stable(feature = "rust1", since = "1.0.0")]  | 
47 |  | -#[doc(no_inline)] pub use result::Result::{self, Ok, Err};  | 
 | 69 | +#[doc(no_inline)]  | 
 | 70 | +pub use borrow::ToOwned;  | 
48 | 71 | #[stable(feature = "rust1", since = "1.0.0")]  | 
49 |  | -#[doc(no_inline)] pub use slice::SliceConcatExt;  | 
 | 72 | +#[doc(no_inline)]  | 
 | 73 | +pub use slice::SliceConcatExt;  | 
50 | 74 | #[stable(feature = "rust1", since = "1.0.0")]  | 
51 |  | -#[doc(no_inline)] pub use string::{String, ToString};  | 
 | 75 | +#[doc(no_inline)]  | 
 | 76 | +pub use string::{String, ToString};  | 
52 | 77 | #[stable(feature = "rust1", since = "1.0.0")]  | 
53 |  | -#[doc(no_inline)] pub use vec::Vec;  | 
 | 78 | +#[doc(no_inline)]  | 
 | 79 | +pub use vec::Vec;  | 
0 commit comments