Rollup merge of rust-lang#32894 - brson:fixbeta, r=alexcrichton

Fix beta branch

This test tests a message that is only displayed on nightly.

Still testing this locally, but I suspect it's correct. r? @alexcrichton

Author: steveklabnik

src/test/compile-fail/feature-gate-try-operator.rs

@@ -14,7 +14,5 @@ macro_rules! id {
 
 fn main() {
     id!(x?);  //~ error: the `?` operator is not stable (see issue #31436)
-    //~^ help: add #![feature(question_mark)] to the crate attributes to enable
     y?;  //~ error: the `?` operator is not stable (see issue #31436)
-    //~^ help: add #![feature(question_mark)] to the crate attributes to enable
 }