about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-18 10:46:41 +0000
committerbors <bors@rust-lang.org>2014-06-18 10:46:41 +0000
commitfe931c00cc9875393042f40c7dcd001edcb47b78 (patch)
tree705491d9abe089a14b508ff21eb5ddb66cff7aae /src/libstd
parentaf622a491a18c27764199608f927a408af2f317c (diff)
parente710653a3b2f0c9f7555c0a4fc01d083c7a4ce91 (diff)
downloadrust-fe931c00cc9875393042f40c7dcd001edcb47b78.tar.gz
rust-fe931c00cc9875393042f40c7dcd001edcb47b78.zip
auto merge of #15000 : alexcrichton/rust/fix-rustdoc-tests, r=huonw
Commits have the descriptions.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fmt.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs
index af76defc8f6..7236b527831 100644
--- a/src/libstd/fmt.rs
+++ b/src/libstd/fmt.rs
@@ -420,7 +420,7 @@ use str;
 use string;
 use slice::Vector;
 
-pub use core::fmt::{Formatter, Result, FormatWriter, Show, rt};
+pub use core::fmt::{Formatter, Result, FormatWriter, rt};
 pub use core::fmt::{Show, Bool, Char, Signed, Unsigned, Octal, Binary};
 pub use core::fmt::{LowerHex, UpperHex, String, Pointer};
 pub use core::fmt::{Float, LowerExp, UpperExp};