about summary refs log tree commit diff
path: root/src/libstd/std.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-08-08 19:27:03 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-08-08 19:27:03 -0700
commit56730c094cf95be58fb05b0e423673aca2a98b88 (patch)
tree096a652b16d38a6f4ff65dd39657ccf308249909 /src/libstd/std.rs
parent03cc757fe90b88895fcf911d9cce5c04a008b127 (diff)
parent936f70bd878327d867b6f8f82061d738355a47c9 (diff)
downloadrust-56730c094cf95be58fb05b0e423673aca2a98b88.tar.gz
rust-56730c094cf95be58fb05b0e423673aca2a98b88.zip
Merge remote-tracking branch 'remotes/origin/master' into remove-str-trailing-nulls
Diffstat (limited to 'src/libstd/std.rs')
-rw-r--r--src/libstd/std.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs
index 236103ec886..480c0786e6e 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/std.rs
@@ -178,6 +178,7 @@ pub mod rand;
 pub mod run;
 pub mod sys;
 pub mod cast;
+pub mod fmt;
 pub mod repr;
 pub mod cleanup;
 pub mod reflect;
@@ -217,4 +218,6 @@ mod std {
     pub use unstable;
     pub use str;
     pub use os;
+    pub use fmt;
+    pub use to_bytes;
 }