Auto merge of #28532 - Eljay:misc-fixes, r=bluss

As the title says, just cleaning up some old stuff.

2 files changed, 0 insertions, 11 deletions

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 :(