---

bblum · bblum · commit a8ae663e9883 · 2012-07-24T17:27:34.000-04:00
yaml --- r: 22700 b: refs/heads/master c: be3a71a h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 160ffb0c2fdb009af7d4a76181129b4d12b8f2e7
+refs/heads/master: be3a71a1aa36173ce2cd521f811d8010029aa46f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libcore/option.rs b/trunk/src/libcore/option.rs
@@ -120,6 +120,12 @@ pure fn unwrap<T>(-opt: option<T>) -> 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; }
+    unwrap(opt)
+}
+
 impl extensions<T> for option<T> {
     /**
      * Update an optional value by optionally running its content through a

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,12 @@ pure fn unwrap<T>(-opt: option<T>) -> T {`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
	`123`	`+pure fn unwrap_expect<T>(-opt: option<T>, reason: ~str) -> T {`
	`124`	`+ //! As unwrap, but with a specified failure message.`
	`125`	`+ if opt.is_none() { fail reason; }`
	`126`	`+ unwrap(opt)`
	`127`	`+}`
	`128`	`+`
`123`	`129`	`impl extensions<T> for option<T> {`
`124`	`130`	`/**`
`125`	`131`	`* Update an optional value by optionally running its content through a`