Merge pull request #32897 from brson/fixbeta

alexcrichton · alexcrichton · commit ca384573c458 · 2016-04-11T17:42:01.000-07:00
[beta] Fix beta branch
diff --git a/src/test/compile-fail/feature-gate-try-operator.rs b/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
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,5 @@ macro_rules! id {`
`14`	`14`
`15`	`15`	`fn main() {`
`16`	`16`	id!(x?); //~ error: the `?` operator is not stable (see issue #31436)
`17`		`- //~^ help: add #![feature(question_mark)] to the crate attributes to enable`
`18`	`17`	y?; //~ error: the `?` operator is not stable (see issue #31436)
`19`		`- //~^ help: add #![feature(question_mark)] to the crate attributes to enable`
`20`	`18`	`}`