about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorVitaly _Vi Shukela <vi0oss@gmail.com>2018-09-17 03:16:08 +0300
committerVitaly _Vi Shukela <vi0oss@gmail.com>2018-09-17 03:20:08 +0300
commit2b7776094492bcdb9ecf62f5333b719f30ffce1f (patch)
tree6d1cae430c70c79ed8aa945f5faf6cf786506e3b /src/libsyntax
parentc61f4a71448f817848059e5c0942d14d14c929b6 (diff)
downloadrust-2b7776094492bcdb9ecf62f5333b719f30ffce1f.tar.gz
rust-2b7776094492bcdb9ecf62f5333b719f30ffce1f.zip
Fill in suggestions Applicability according to @estebank
Also fix some formatting along the way.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/config.rs5
-rw-r--r--src/libsyntax/ext/tt/macro_rules.rs8
-rw-r--r--src/libsyntax/parse/parser.rs11
3 files changed, 13 insertions, 11 deletions
diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs
index c3917488b98..63e719a0d4e 100644
--- a/src/libsyntax/config.rs
+++ b/src/libsyntax/config.rs
@@ -124,10 +124,11 @@ impl<'a> StripUnconfigured<'a> {
             let error = |span, msg, suggestion: &str| {
                 let mut err = self.sess.span_diagnostic.struct_span_err(span, msg);
                 if !suggestion.is_empty() {
-                    err.span_suggestion_with_applicability(span,
+                    err.span_suggestion_with_applicability(
+                                                           span,
                                                            "expected syntax is",
                                                            suggestion.into(),
-                                                           Applicability::Unspecified,
+                                                           Applicability::MaybeIncorrect,
                                                            );
                 }
                 err.emit();
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index 75f46f2e02c..bbe49d409ea 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -189,10 +189,10 @@ fn generic_extension<'cx>(cx: &'cx mut ExtCtxt,
                         err.note("you might be missing a comma");
                     } else {
                         err.span_suggestion_short_with_applicability(
-                            comma_span,
-                            "missing comma here",
-                            ", ".to_string(),
-                            Applicability::Unspecified,
+                                                comma_span,
+                                                "missing comma here",
+                                                ", ".to_string(),
+                                                Applicability::MachineApplicable,
                         );
                     }
                 }
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 458a5c6473f..18287189539 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3882,11 +3882,12 @@ impl<'a> Parser<'a> {
                 if self.token == token::CloseDelim(token::Brace) {
                     // If the struct looks otherwise well formed, recover and continue.
                     if let Some(sp) = comma_sp {
-                        err.span_suggestion_short_with_applicability(sp,
-                                                                     "remove this comma",
-                                                                     String::new(),
-                                                                     Applicability::Unspecified,
-                                                                     );
+                        err.span_suggestion_short_with_applicability(
+                                                                 sp,
+                                                                 "remove this comma",
+                                                                 String::new(),
+                                                                 Applicability::MachineApplicable,
+                                                                 );
                     }
                     err.emit();
                     break;