diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-02 15:49:42 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-03 17:19:56 -0700 |
| commit | 896cfcc67fb8d3e53a5dcf138f79909891bf940e (patch) | |
| tree | df4433cee95ca769c9dc664a63455bcc5f42c166 /src/libstd/io/timer.rs | |
| parent | b981add9ee56a2d6dc11aa48f01aac5d0dda9327 (diff) | |
| download | rust-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/io/timer.rs')
| -rw-r--r-- | src/libstd/io/timer.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index 2df6062b7ac..d7476dd2de8 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -21,7 +21,6 @@ use comm::Receiver; use io::IoResult; use kinds::Send; use owned::Box; -use option::Expect; use rt::rtio::{IoFactory, LocalIo, RtioTimer}; /// A synchronous timer object |