about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-06 17:01:56 +0000
committerbors <bors@rust-lang.org>2018-06-06 17:01:56 +0000
commitcb8ab33ed29544973da866bdc3eff509b3c3e789 (patch)
tree59d7a285f80978ad23c4ff712a9b0084506ceb6a
parent35aeecb8aa23e2f4ce23a2490921ede0422b5805 (diff)
parent804984836eb98fd61bc5f03aff8756a9c1cf2fa4 (diff)
Auto merge of #51333 - GuillaumeGomez:reexport-fmt-alignment, r=SimonSapin
Reexport fmt::Alignment into std

Follow-up of #51078.
-rw-r--r--src/liballoc/fmt.rs2
-rw-r--r--src/libcore/fmt/mod.rs3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs
index a4e5373d907..b49ec0ae252 100644
--- 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
index 0515eeed30b..d91bf463383 100644
--- 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;
     ///