about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-04-24 22:54:25 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-04-24 22:54:25 -0400
commit13854722fa509a48820e8a384b55ac92ad0e19b9 (patch)
treebc9667f69215f44ae0eb3dfb15eaa32ee0a5ed13 /src/libsyntax
parentc632bdc67a6567550a8a1b25eaddea77d3143acb (diff)
parent0cae31513b775261f8ac957637899ce2cc838bc8 (diff)
downloadrust-13854722fa509a48820e8a384b55ac92ad0e19b9.tar.gz
rust-13854722fa509a48820e8a384b55ac92ad0e19b9.zip
Rollup merge of #24749 - lstat:feature-gate-22820, r=nrc
As part of the audit for #22820 the following feature gate tests have been
added:

* `negate_unsigned`
* `on_unimplemented`
* `optin_builtin_traits`
* `plugin`
* `rustc_attrs`
* `rustc_diagnostic_macros`
* `slice_patterns`

In addition some feature gate error message typos fixed.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index d0975c76e93..fa95f667c15 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -394,7 +394,7 @@ impl<'a> Context<'a> {
                                are reserved for internal compiler diagnostics");
         } else if name.starts_with("derive_") {
             self.gate_feature("custom_derive", attr.span,
-                              "attributes of the form `#[derive_*]` are reserved
+                              "attributes of the form `#[derive_*]` are reserved \
                                for the compiler");
         } else {
             self.gate_feature("custom_attribute", attr.span,
@@ -620,7 +620,7 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> {
                                   pattern.span,
                                   "multiple-element slice matches anywhere \
                                    but at the end of a slice (e.g. \
-                                   `[0, ..xs, 0]` are experimental")
+                                   `[0, ..xs, 0]`) are experimental")
             }
             ast::PatVec(..) => {
                 self.gate_feature("slice_patterns",