about summary refs log tree commit diff
path: root/src/libstd/slice.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-04 20:41:44 -0700
committerbors <bors@rust-lang.org>2014-06-04 20:41:44 -0700
commit422d54bed212b4f0356fb56bbc31c8deef7a6b77 (patch)
treeb343a08725e1e61bb02b3a0fa1427204e7a47587 /src/libstd/slice.rs
parent193574ae1e3881f95afb8b3e385a9e410ac6798a (diff)
parent896cfcc67fb8d3e53a5dcf138f79909891bf940e (diff)
downloadrust-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/slice.rs')
-rw-r--r--src/libstd/slice.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs
index 8f66279a9a3..d6f63da09f2 100644
--- a/src/libstd/slice.rs
+++ b/src/libstd/slice.rs
@@ -296,7 +296,6 @@ impl<'a, T: Clone> CloneableVector<T> for &'a [T] {
     fn to_owned(&self) -> ~[T] {
         use RawVec = core::raw::Vec;
         use num::{CheckedAdd, CheckedMul};
-        use option::Expect;
 
         let len = self.len();
         let data_size = len.checked_mul(&mem::size_of::<T>());