aboutsummaryrefslogtreecommitdiff
path: root/src/lib/option.rs
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2011-04-07 10:14:25 -0700
committerPatrick Walton <[email protected]>2011-04-07 10:14:25 -0700
commit2a894cabc237f32484dd9fb4265790c60eefd661 (patch)
tree3d3b128ae9670f7b425d6cd68936482f603ca656 /src/lib/option.rs
parentMerge branch 'master' of github.com:graydon/rust (diff)
parentRun optimizations. (diff)
downloadrust-2a894cabc237f32484dd9fb4265790c60eefd661.tar.xz
rust-2a894cabc237f32484dd9fb4265790c60eefd661.zip
Merge branch 'master' of github.com:graydon/rust
Diffstat (limited to 'src/lib/option.rs')
-rw-r--r--src/lib/option.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/option.rs b/src/lib/option.rs
index 29a6f6eb..66a41bca 100644
--- a/src/lib/option.rs
+++ b/src/lib/option.rs
@@ -38,6 +38,13 @@ fn is_none[T](&t[T] opt) -> bool {
}
}
+fn from_maybe[T](&T def, &t[T] opt) -> T {
+ alt(opt) {
+ case (none[T]) { ret def; }
+ case (some[T](?t)) { ret t; }
+ }
+}
+
// Local Variables:
// mode: rust;
// fill-column: 78;