---

yaml
---
r: 15445
b: refs/heads/try
c: e712ad8
h: refs/heads/master
i:
  15443: 846f00a
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3e6943d8201215e60b74df7d3be8f48a52b3c2b7
+refs/heads/try: e712ad8f7342203504abae1b04545160610f3fc9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/option.rs

@@ -100,6 +100,15 @@ impl extensions<T:copy> for option<T> {
         { map_default(self, def, f) }
     #[doc = "Performs an operation on the contained value or does nothing"]
     fn iter(f: fn(T)) { iter(self, f) }
+
+    #[doc = "Performs an operation on the contained value or does nothing"]
+    fn each(f: fn(T) -> bool) {
+        alt self {
+          none { /* ok */ }
+          some(e) { f(e); }
+        }
+    }
+
     #[doc = "
     Gets the value out of an option
 

branches/try/src/rustc/middle/ty.rs

@@ -807,10 +807,11 @@ fn fold_region(cx: ctxt, t0: t, fldop: fn(region, bool) -> region) -> t {
 }
 
 fn substitute_type_params(cx: ctxt, substs: [ty::t], typ: t) -> t {
+    if substs.len() == 0u { ret typ; }
     let tb = get(typ);
+    if !tb.has_params { ret typ; }
     alt tb.struct {
       ty_param(idx, _) { substs[idx] }
-      _ if !tb.has_params { typ }
       s { mk_t(cx, fold_sty(s) {|t| substitute_type_params(cx, substs, t)}) }
     }
 }