about summary refs log tree commit diff
path: root/src/libcore/option.rs
diff options
context:
space:
mode:
authorEric Holk <eric.holk@gmail.com>2012-08-03 11:43:10 -0700
committerEric Holk <eric.holk@gmail.com>2012-08-03 12:04:18 -0700
commit01ca0d1f680cf5aab5d1a81fea9de56d591f6658 (patch)
tree7d35cad7d5865a16d912e14c6539f59bfe501532 /src/libcore/option.rs
parent9e689666110e459e63f5bf4b64011fc81cc7fca2 (diff)
Be more defensive in pipes (#3098)
Diffstat (limited to 'src/libcore/option.rs')
-rw-r--r--src/libcore/option.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index bb5cca90cd0..935d22fbaae 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -127,9 +127,9 @@ fn swap_unwrap<T>(opt: &mut option<T>) -> T {
     unwrap(util::replace(opt, none))
 }
 
-pure fn unwrap_expect<T>(-opt: option<T>, reason: ~str) -> T {
+pure fn unwrap_expect<T>(-opt: option<T>, reason: &str) -> T {
     //! As unwrap, but with a specified failure message.
-    if opt.is_none() { fail reason; }
+    if opt.is_none() { fail reason.to_unique(); }
     unwrap(opt)
 }