Miscellaneous cleanup for old issues.

6 files changed, 3 insertions, 23 deletions

diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs
index ebb8036bacf..a72e348c720 100644
--- a/src/test/bench/core-map.rs
+++ b/src/test/bench/core-map.rs
@@ -126,8 +126,7 @@ fn main() {
 
     println!("{} keys", n_keys);
 
-    // FIXME: #9970
-    println!("{}", "\nBTreeMap:");
+    println!("\nBTreeMap:");
 
     {
         let mut map: BTreeMap<usize,usize> = BTreeMap::new();
@@ -145,8 +144,7 @@ fn main() {
         vector(&mut map, n_keys, &rand);
     }
 
-    // FIXME: #9970
-    println!("{}", "\nHashMap:");
+    println!("\nHashMap:");
 
     {
         let mut map: HashMap<usize,usize> = HashMap::new();
diff --git a/src/test/compile-fail/borrowck-borrow-overloaded-auto-deref-mut.rs b/src/test/compile-fail/borrowck-borrow-overloaded-auto-deref-mut.rs
index dd278faa0dc..497b0e63edf 100644
--- a/src/test/compile-fail/borrowck-borrow-overloaded-auto-deref-mut.rs
+++ b/src/test/compile-fail/borrowck-borrow-overloaded-auto-deref-mut.rs
@@ -111,12 +111,9 @@ fn assign_field4<'a>(x: &'a mut Own<Point>) {
     x.y = 3; //~ ERROR cannot borrow
 }
 
-// FIXME(eddyb) #12825 This shouldn't attempt to call deref_mut.
-/*
 fn deref_imm_method(x: Own<Point>) {
     let __isize = x.get();
 }
-*/
 
 fn deref_mut_method1(x: Own<Point>) {
     x.set(0, 0); //~ ERROR cannot borrow
diff --git a/src/test/compile-fail/feature-gated-feature-in-macro-arg.rs b/src/test/compile-fail/feature-gated-feature-in-macro-arg.rs
index 54bdaf011c8..ae342af4a52 100644
--- a/src/test/compile-fail/feature-gated-feature-in-macro-arg.rs
+++ b/src/test/compile-fail/feature-gated-feature-in-macro-arg.rs
@@ -8,14 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// FIXME #20661: format_args! emits calls to the unstable std::fmt::rt
-// module, so the compiler has some hacks to make that possible
-// (in span_is_internal). Unnfortunately those hacks defeat this
-// particular scenario of checking feature gates in arguments to
-// println!().
-
-// ignore-test
-
 // tests that input to a macro is checked for use of gated features. If this
 // test succeeds due to the acceptance of a feature, pick a new feature to
 // test. Not ideal, but oh well :(
diff --git a/src/test/run-pass/issue-5060.rs b/src/test/run-pass/issue-5060.rs
index 5726f236e2e..21e3343f445 100644
--- a/src/test/run-pass/issue-5060.rs
+++ b/src/test/run-pass/issue-5060.rs
@@ -16,8 +16,7 @@ macro_rules! print_hd_tl {
             print!("{}", stringify!($field_tl));
             print!(", ");
         )+
-        // FIXME: #9970
-        print!("{}", "]\n");
+        print!("]\n");
     })
 }
 
diff --git a/src/test/run-pass/lambda-var-hygiene.rs b/src/test/run-pass/lambda-var-hygiene.rs
index e5bdca1a067..ae5bf71d15f 100644
--- a/src/test/run-pass/lambda-var-hygiene.rs
+++ b/src/test/run-pass/lambda-var-hygiene.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test #9383
-
 // shouldn't affect evaluation of $ex:
 macro_rules! bad_macro {
     ($ex:expr) => ({(|_x| { $ex }) (9) })
diff --git a/src/test/rustdoc/hidden-line.rs b/src/test/rustdoc/hidden-line.rs
index af67f7e2c1f..e05d51c2bac 100644
--- a/src/test/rustdoc/hidden-line.rs
+++ b/src/test/rustdoc/hidden-line.rs
@@ -12,8 +12,6 @@
 /// retained.
 ///
 /// ```rust
-/// mod to_make_deriving_work { // FIXME #4913
-///
 /// # #[derive(PartialEq)] // invisible
 /// # struct Foo; // invisible
 ///
@@ -24,8 +22,6 @@
 ///     let x = Bar(Foo);
 ///     assert_eq!(x, x); // check that the derivings worked
 /// }
-///
-/// }
 /// ```
 pub fn foo() {}