summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-05-06 21:25:36 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-07 08:17:32 -0700
commit0d8f5fa618da00653897be2050980c800389be82 (patch)
treed88105c495c8df50a0226e06ea1179bac1126896 /src/libstd/lib.rs
parent4a974413dcce8a5a9f1df3d58503c63b8f5b556a (diff)
downloadrust-0d8f5fa618da00653897be2050980c800389be82.tar.gz
rust-0d8f5fa618da00653897be2050980c800389be82.zip
core: Move Option::expect to libstd from libcore
See #14008 for more details
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 4a555035a08..abcc1f099b4 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -149,7 +149,6 @@ pub use core::default;
 pub use core::intrinsics;
 pub use core::iter;
 pub use core::mem;
-pub use core::option;
 pub use core::ptr;
 pub use core::raw;
 pub use core::tuple;
@@ -221,7 +220,7 @@ pub mod hash;
 /* Common data structures */
 
 pub mod result;
-
+pub mod option;
 
 /* Tasks and communication */