Rollup merge of #22944 - Manishearth:patch-1, r=sfackler

Been breaking tests lately. Somehow nondeterministic?

src/test/run-pass/macro-attributes.rs

@@ -10,6 +10,8 @@
 
 // ignore-pretty - token trees can't pretty print
 
+#![feature(custom_attribute)]
+
 macro_rules! compiles_fine {
     (#[$at:meta]) => {
         // test that the different types of attributes work