rollup merge of rust-lang#16840 : huonw/feature-has-added

alexcrichton · alexcrichton · commit 4a4fe515bd4b · 2014-08-29T14:21:58.000-07:00
diff --git a/src/librustc/front/feature_gate.rs b/src/librustc/front/feature_gate.rs
@@ -417,7 +417,7 @@ pub fn check_crate(sess: &Session, krate: &ast::Crate) {
                             sess.span_err(mi.span, "feature has been removed");
                         }
                         Some(&(_, Accepted)) => {
-                            sess.span_warn(mi.span, "feature has added to rust, \
+                            sess.span_warn(mi.span, "feature has been added to rust, \
                                                      directive not necessary");
                         }
                         None => {

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ pub fn check_crate(sess: &Session, krate: &ast::Crate) {`
`417`	`417`	`sess.span_err(mi.span, "feature has been removed");`
`418`	`418`	`}`
`419`	`419`	`Some(&(_, Accepted)) => {`
`420`		`- sess.span_warn(mi.span, "feature has added to rust, \`
	`420`	`+ sess.span_warn(mi.span, "feature has been added to rust, \`
`421`	`421`	`directive not necessary");`
`422`	`422`	`}`
`423`	`423`	`None => {`