Skip to content

Commit 9c80667

Browse files
committed
---
yaml --- r: 115551 b: refs/heads/try c: f12b517 h: refs/heads/master i: 115549: cb0f77b 115547: a0819f8 115543: d892c32 115535: 39cabc2 115519: 96d68a9 v: v3
1 parent d91b2eb commit 9c80667

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
5-
refs/heads/try: e4271cae54c7f4a868c60a1822b91e702e511947
5+
refs/heads/try: f12b51705b064bbbeb86ad65663de476d07ad51f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/option.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,9 @@
138138
//! }
139139
//! ```
140140
141-
use any::Any;
142141
use cmp::{Eq, TotalEq, TotalOrd};
143142
use default::Default;
144143
use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSize};
145-
use kinds::Send;
146144
use mem;
147145
use slice;
148146

@@ -238,7 +236,7 @@ impl<T> Option<T> {
238236
///
239237
/// Fails if the value is a `None` with a custom failure message provided by `msg`.
240238
#[inline]
241-
pub fn expect<M: Any + Send>(self, msg: M) -> T {
239+
pub fn expect(self, msg: &str) -> T {
242240
match self {
243241
Some(val) => val,
244242
None => fail!(msg),

0 commit comments

Comments
 (0)