---

yaml
---
r: 113875
b: refs/heads/master
c: f12b517
h: refs/heads/master
i:
  113873: 1a52112
  113871: af4669d
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e4271cae54c7f4a868c60a1822b91e702e511947
+refs/heads/master: f12b51705b064bbbeb86ad65663de476d07ad51f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/libcore/option.rs

@@ -138,11 +138,9 @@
 //! }
 //! ```
 
-use any::Any;
 use cmp::{Eq, TotalEq, TotalOrd};
 use default::Default;
 use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSize};
-use kinds::Send;
 use mem;
 use slice;
 
@@ -238,7 +236,7 @@ impl<T> Option<T> {
     ///
     /// Fails if the value is a `None` with a custom failure message provided by `msg`.
     #[inline]
-    pub fn expect<M: Any + Send>(self, msg: M) -> T {
+    pub fn expect(self, msg: &str) -> T {
         match self {
             Some(val) => val,
             None => fail!(msg),