---

yaml
---
r: 152817
b: refs/heads/try2
c: e4e3550
h: refs/heads/master
i:
  152815: 2c243ce
v: v3

Author: Sawyer47

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 58078005cf053fd66b3d748675c19063badc9640
+refs/heads/try2: e4e3550ff6ee1754ea4d7191989044c444bff049
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/compile-fail/issue-9725.rs

@@ -8,10 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test FIXME: #13992
-
 struct A { foo: int }
 
 fn main() {
-    let A { foo, foo } = A { foo: 3 }; //~ ERROR: field `foo` bound twice
+    let A { foo, foo } = A { foo: 3 };
+    //~^ ERROR: identifier `foo` is bound more than once in the same pattern
 }

branches/try2/src/test/compile-fail/regionck-closure-lifetimes.rs

@@ -8,25 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn env<'a>(_: &'a uint, blk: |p: ||: 'a|) {
+fn env<'a>(blk: |p: ||: 'a|) {
     // Test that the closure here cannot be assigned
     // the lifetime `'a`, which outlives the current
     // block.
-    //
-    // FIXME(#4846): The `&'a uint` parameter is needed to ensure that `'a`
-    // is a free and not bound region name.
 
     let mut state = 0;
     let statep = &mut state;
     blk(|| *statep = 1); //~ ERROR cannot infer
 }
 
-fn no_env_no_for<'a>(_: &'a uint, blk: |p: |||: 'a) {
+fn no_env_no_for<'a>(blk: |p: |||: 'a) {
     // Test that a closure with no free variables CAN
     // outlive the block in which it is created.
-    //
-    // FIXME(#4846): The `&'a uint` parameter is needed to ensure that `'a`
-    // is a free and not bound region name.
 
     blk(|| ())
 }

branches/try2/src/test/run-pass/item-attributes.rs

@@ -95,19 +95,17 @@ mod test_stmt_multi_attr_outer {
         #[attr2 = "val"]
         fn f() { }
 
-        /* FIXME: Issue #493
         #[attr1 = "val"]
         #[attr2 = "val"]
         mod mod1 {
         }
 
-        pub mod rustrt {
+        mod rustrt {
             #[attr1 = "val"]
             #[attr2 = "val"]
             extern {
             }
         }
-        */
     }
 }
 

branches/try2/src/test/run-pass/reexport-star.rs

@@ -11,8 +11,6 @@
 
 #![feature(globs)]
 
-// FIXME #3654
-
 mod a {
     pub fn f() {}
     pub fn g() {}

branches/try2/src/test/run-pass/trait-generic.rs

@@ -29,9 +29,8 @@ trait map<T> {
 impl<T> map<T> for Vec<T> {
     fn map<U>(&self, f: |&T| -> U) -> Vec<U> {
         let mut r = Vec::new();
-        // FIXME: #7355 generates bad code with VecIterator
-        for i in range(0u, self.len()) {
-            r.push(f(self.get(i)));
+        for i in self.iter() {
+            r.push(f(i));
         }
         r
     }