diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-08-30 23:47:33 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-08-30 23:47:33 -0700 |
| commit | 1bd0df3fbb3f3c9bf12670958676ce8b7dd954e8 (patch) | |
| tree | 6e44ff19784a89cacaba5dd9ea47e1acd6f5119b | |
| parent | d1a5b277a1cef4cfd48e9aa987e5c8776360fd25 (diff) | |
| parent | b79930eeb94ebc0422f919eab4fdf910d2d0fc3c (diff) | |
rollup merge of #16840 : huonw/feature-has-added
| -rw-r--r-- | src/librustc/front/feature_gate.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/gated-bad-feature.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/front/feature_gate.rs b/src/librustc/front/feature_gate.rs index 18f4b79de6e..23054347265 100644 --- 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 => { diff --git a/src/test/compile-fail/gated-bad-feature.rs b/src/test/compile-fail/gated-bad-feature.rs index 5a68afaceb9..39cd3e3b86a 100644 --- a/src/test/compile-fail/gated-bad-feature.rs +++ b/src/test/compile-fail/gated-bad-feature.rs @@ -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 |