Align contents of prelude/v1.rs in libcore and libstd

Author: SimonSapin

src/libcore/prelude/v1.rs

@@ -18,39 +18,28 @@
 
 // Re-exported core operators
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use marker::{Copy, Send, Sized, Sync};
+#[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync};
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use ops::{Drop, Fn, FnMut, FnOnce};
+#[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce};
 
 // Re-exported functions
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use mem::drop;
+#[doc(no_inline)] pub use mem::drop;
 
 // Re-exported types and traits
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use clone::Clone;
+#[doc(no_inline)] pub use clone::Clone;
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
+#[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use convert::{AsRef, AsMut, Into, From};
+#[doc(no_inline)] pub use convert::{AsRef, AsMut, Into, From};
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use default::Default;
+#[doc(no_inline)] pub use default::Default;
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use iter::{Iterator, Extend, IntoIterator};
+#[doc(no_inline)] pub use iter::{Iterator, Extend, IntoIterator};
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use iter::{DoubleEndedIterator, ExactSizeIterator};
+#[doc(no_inline)] pub use iter::{DoubleEndedIterator, ExactSizeIterator};
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use option::Option::{self, Some, None};
+#[doc(no_inline)] pub use option::Option::{self, Some, None};
 #[stable(feature = "core_prelude", since = "1.4.0")]
-#[doc(no_inline)]
-pub use result::Result::{self, Ok, Err};
+#[doc(no_inline)] pub use result::Result::{self, Ok, Err};

src/libstd/prelude/v1.rs

@@ -8,10 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+
 //! The first version of the prelude of The Rust Standard Library.
 //!
 //! See the [module-level documentation](../index.html) for more.
 
+
 #![stable(feature = "rust1", since = "1.0.0")]
 
 // Re-exported core operators
@@ -26,10 +28,6 @@
 
 // Re-exported types and traits
 #[stable(feature = "rust1", since = "1.0.0")]
-#[doc(no_inline)] pub use boxed::Box;
-#[stable(feature = "rust1", since = "1.0.0")]
-#[doc(no_inline)] pub use borrow::ToOwned;
-#[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use clone::Clone;
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
@@ -45,6 +43,16 @@
 #[doc(no_inline)] pub use option::Option::{self, Some, None};
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use result::Result::{self, Ok, Err};
+
+
+// Contents so far are equivalent to src/libcore/prelude/v1.rs
+
+
+// Re-exported types and traits that involve memory allocation
+#[stable(feature = "rust1", since = "1.0.0")]
+#[doc(no_inline)] pub use boxed::Box;
+#[stable(feature = "rust1", since = "1.0.0")]
+#[doc(no_inline)] pub use borrow::ToOwned;
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use slice::SliceConcatExt;
 #[stable(feature = "rust1", since = "1.0.0")]