From 896cfcc67fb8d3e53a5dcf138f79909891bf940e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 2 Jun 2014 15:49:42 -0700
Subject: 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
---
 src/libstd/io/timer.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libstd/io')

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
-- 
cgit 1.4.1-3-g733a5