Auto merge of #51333 - GuillaumeGomez:reexport-fmt-alignment, r=Simon…

…Sapin Reexport fmt::Alignment into std Follow-up of #51078.
rust-lang · Jun 6, 2018 · cb8ab33 · cb8ab33
2 parents 35aeecb + 8049848
commit cb8ab33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs
@@ -531,6 +531,8 @@ pub use core::fmt::Error;
 pub use core::fmt::{write, ArgumentV1, Arguments};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::fmt::{DebugList, DebugMap, DebugSet, DebugStruct, DebugTuple};
+#[stable(feature = "fmt_flags_align", since = "1.28.0")]
+pub use core::fmt::{Alignment};
 
 use string;
 

diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
@@ -1436,8 +1436,7 @@ impl<'a> Formatter<'a> {
     /// ```
     /// extern crate core;
     ///
-    /// use std::fmt;
-    /// use core::fmt::Alignment;
+    /// use std::fmt::{self, Alignment};
     ///
     /// struct Foo;
     ///