diff options
| author | bors <bors@rust-lang.org> | 2014-05-15 23:26:26 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-15 23:26:26 -0700 |
| commit | b545a499fad8d58f858e7c14bcdc90171b97efdf (patch) | |
| tree | e4bebf36fa24fe0fe4dd6846291c59520ef1be28 /src/libstd/lib.rs | |
| parent | 84406d438c6c49aa63875096e5f3cca1a3879f17 (diff) | |
| parent | 2e2160b026d7a2b2d13c3a2b4d6aa073ab3ff43f (diff) | |
| download | rust-b545a499fad8d58f858e7c14bcdc90171b97efdf.tar.gz rust-b545a499fad8d58f858e7c14bcdc90171b97efdf.zip | |
auto merge of #14115 : alexcrichton/rust/core-fmt, r=brson
This was a more difficult change than I thought it would be, and it is unfortunately a breaking change rather than a drop-in replacement. Most of the rationale can be found in the third commit. cc #13851
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 2 |
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 */ |