about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-05-10 13:46:05 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-15 23:22:06 -0700
commitc25556865205e6978e6bc9eb0e6d5e151e1a68d9 (patch)
treee4b76d3dad3688c127a17937dafb24ae6eeefee6 /src/libstd/lib.rs
parentcf0619383d2ce0f7bd822f82cf487c7fa33d0b76 (diff)
downloadrust-c25556865205e6978e6bc9eb0e6d5e151e1a68d9.tar.gz
rust-c25556865205e6978e6bc9eb0e6d5e151e1a68d9.zip
core: Implement unwrap()/unwrap_err() on Result
Now that std::fmt is in libcore, it's possible to implement this as an inherit
method rather than through extension traits.

This commit also tweaks the failure interface of libcore to libstd to what it
should be, one method taking &fmt::Arguments
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 87c4ef1046f..119cd9aa2ca 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -153,6 +153,7 @@ pub use core::mem;
 pub use core::ptr;
 pub use core::raw;
 pub use core::tuple;
+pub use core::result;
 
 // Run tests with libgreen instead of libnative.
 //
@@ -218,7 +219,6 @@ pub mod hash;
 
 /* Common data structures */
 
-pub mod result;
 pub mod option;
 
 /* Tasks and communication */