about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-11 18:06:51 +0000
committerbors <bors@rust-lang.org>2015-10-11 18:06:51 +0000
commit9dafceb1f9df02bb0273af5f71b1824d6ce71f68 (patch)
tree768c45ac2932a237e05f6ee9ca404755cac7a3bb
parent603582776ae05b8ed2ec2df01e4403db4b8efaef (diff)
parent988ab562ebd09ce471e603932d2a5d1b39e91e0c (diff)
downloadrust-9dafceb1f9df02bb0273af5f71b1824d6ce71f68.tar.gz
rust-9dafceb1f9df02bb0273af5f71b1824d6ce71f68.zip
Auto merge of #28948 - steveklabnik:gh28944, r=alexcrichton
"Crate features" isn't a thing in Rust, but you do need to add this line
to your crate root.

Fixes #28944
-rw-r--r--src/librustc_typeck/check/writeback.rs2
-rw-r--r--src/test/compile-fail/augmented-assignments-feature-gate-cross.rs2
-rw-r--r--src/test/compile-fail/augmented-assignments-feature-gate.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_typeck/check/writeback.rs b/src/librustc_typeck/check/writeback.rs
index 16884e76a8e..2c18a245159 100644
--- a/src/librustc_typeck/check/writeback.rs
+++ b/src/librustc_typeck/check/writeback.rs
@@ -131,7 +131,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
                                 "overloaded augmented assignments are not stable");
                             fileline_help!(
                                 tcx.sess, e.span,
-                                "add #![feature(augmented_assignments)] to the crate features \
+                                "add #![feature(augmented_assignments)] to the crate root \
                                  to enable");
                         }
                     }
diff --git a/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs b/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs
index 0aca9a5c7ee..c26d6cf4fe6 100644
--- a/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs
+++ b/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs
@@ -21,5 +21,5 @@ fn main() {
     let mut x = Int(0);
     x += 1;
     //~^ error: overloaded augmented assignments are not stable
-    // | help: add #![feature(augmented_assignments)] to the crate features to enable
+    // | help: add #![feature(augmented_assignments)] to the crate root to enable
 }
diff --git a/src/test/compile-fail/augmented-assignments-feature-gate.rs b/src/test/compile-fail/augmented-assignments-feature-gate.rs
index 66c3014c7a9..0db8f9858f9 100644
--- a/src/test/compile-fail/augmented-assignments-feature-gate.rs
+++ b/src/test/compile-fail/augmented-assignments-feature-gate.rs
@@ -22,5 +22,5 @@ fn main() {
     let mut x = Int(0);
     x += 1;
     //~^ error: overloaded augmented assignments are not stable
-    // | help: add #![feature(augmented_assignments)] to the crate features to enable
+    // | help: add #![feature(augmented_assignments)] to the crate root to enable
 }