auto merge of #14610 : alexcrichton/rust/issue-14008, r=brson

This commit removes the <M: Any + Send> type parameter from Option::expect in
favor of just taking a hard-coded `&str` argument. This allows this function to
move into libcore.

Previous code using strings with `expect` will continue to work, but code using
this implicitly to transmit task failure will need to unwrap manually with a
`match` statement.

[breaking-change]
Closes #14008

1 files changed, 1 insertions, 4 deletions

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index cde1a7335a5..db84a724adb 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -155,6 +155,7 @@ pub use core::simd;
 pub use core::tuple;
 #[cfg(not(test))] pub use core::ty;
 pub use core::result;
+pub use core::option;
 
 pub use alloc::owned;
 pub use alloc::rc;
@@ -219,10 +220,6 @@ pub mod num;
 pub mod to_str;
 pub mod hash;
 
-/* Common data structures */
-
-pub mod option;
-
 /* Tasks and communication */
 
 pub mod task;