diff options
| author | bors <bors@rust-lang.org> | 2014-06-04 20:41:44 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-04 20:41:44 -0700 |
| commit | 422d54bed212b4f0356fb56bbc31c8deef7a6b77 (patch) | |
| tree | b343a08725e1e61bb02b3a0fa1427204e7a47587 /src/libstd/io | |
| parent | 193574ae1e3881f95afb8b3e385a9e410ac6798a (diff) | |
| parent | 896cfcc67fb8d3e53a5dcf138f79909891bf940e (diff) | |
| download | rust-422d54bed212b4f0356fb56bbc31c8deef7a6b77.tar.gz rust-422d54bed212b4f0356fb56bbc31c8deef7a6b77.zip | |
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
Diffstat (limited to 'src/libstd/io')
| -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 |