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

This commit is contained in:
Alex Crichton 2014-08-30 23:47:33 -07:00
commit 1bd0df3fbb
2 changed files with 2 additions and 2 deletions

View File

@ -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 => {

View File

@ -20,4 +20,4 @@
#![feature = "foo"] //~ ERROR: malformed feature
#![feature(test_removed_feature)] //~ ERROR: feature has been removed
#![feature(test_accepted_feature)] //~ WARNING: feature has added
#![feature(test_accepted_feature)] //~ WARNING: feature has been added