From e4e3550ff6ee1754ea4d7191989044c444bff049 Mon Sep 17 00:00:00 2001
From: Piotr Jawniak <sawyer47@gmail.com>
Date: Mon, 23 Jun 2014 19:01:14 +0200
Subject: [PATCH] Remove few FIXMEs

This commit removes FIXMEs of few closed issues.

Closes #13992
---
 src/test/compile-fail/issue-9725.rs                 |  5 ++---
 src/test/compile-fail/regionck-closure-lifetimes.rs | 10 ++--------
 src/test/run-pass/item-attributes.rs                |  4 +---
 src/test/run-pass/reexport-star.rs                  |  2 --
 src/test/run-pass/trait-generic.rs                  |  5 ++---
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/test/compile-fail/issue-9725.rs b/src/test/compile-fail/issue-9725.rs
index d5c18263c4c8f..9545ad43ff8b4 100644
--- a/src/test/compile-fail/issue-9725.rs
+++ b/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
 }
diff --git a/src/test/compile-fail/regionck-closure-lifetimes.rs b/src/test/compile-fail/regionck-closure-lifetimes.rs
index e9ef23ebe09e8..731b045d0f322 100644
--- a/src/test/compile-fail/regionck-closure-lifetimes.rs
+++ b/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(|| ())
 }
diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs
index bf94af601fea0..6c2de471f0f58 100644
--- a/src/test/run-pass/item-attributes.rs
+++ b/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 {
             }
         }
-        */
     }
 }
 
diff --git a/src/test/run-pass/reexport-star.rs b/src/test/run-pass/reexport-star.rs
index 6617ff08d1c8f..8de88aacae7fc 100644
--- a/src/test/run-pass/reexport-star.rs
+++ b/src/test/run-pass/reexport-star.rs
@@ -11,8 +11,6 @@
 
 #![feature(globs)]
 
-// FIXME #3654
-
 mod a {
     pub fn f() {}
     pub fn g() {}
diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs
index 9ec50d3f5931b..f3f4c556b7729 100644
--- a/src/test/run-pass/trait-generic.rs
+++ b/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
     }