about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-06-02 15:49:42 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-06-03 17:19:56 -0700
commit896cfcc67fb8d3e53a5dcf138f79909891bf940e (patch)
treedf4433cee95ca769c9dc664a63455bcc5f42c166 /src/libstd/rt
parentb981add9ee56a2d6dc11aa48f01aac5d0dda9327 (diff)
downloadrust-896cfcc67fb8d3e53a5dcf138f79909891bf940e.tar.gz
rust-896cfcc67fb8d3e53a5dcf138f79909891bf940e.zip
std: Remove generics from Option::expect
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
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/env.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/env.rs b/src/libstd/rt/env.rs
index c9e5cae60e4..7271464d1e9 100644
--- a/src/libstd/rt/env.rs
+++ b/src/libstd/rt/env.rs
@@ -11,7 +11,7 @@
 //! Runtime environment settings
 
 use from_str::from_str;
-use option::{Some, None, Expect};
+use option::{Some, None};
 use os;
 use str::Str;