about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2018-09-05 07:33:29 -0700
committerEsteban Küber <esteban@kuber.com.ar>2018-09-05 07:33:29 -0700
commit3192d3dc0c4417a6e360018b341c07d32f3f3d7f (patch)
tree673b98479ba88547d4d275db02b00446f6ef849c /src
parentb2d2d837235d0b06e56bb3191aff7ae358ac6018 (diff)
downloadrust-3192d3dc0c4417a6e360018b341c07d32f3f3d7f.tar.gz
rust-3192d3dc0c4417a6e360018b341c07d32f3f3d7f.zip
Change wording of unclosed delimiter label
Diffstat (limited to 'src')
-rw-r--r--src/libsyntax/parse/lexer/tokentrees.rs5
-rw-r--r--src/test/ui/issue-2354.rs2
-rw-r--r--src/test/ui/issue-2354.stderr2
-rw-r--r--src/test/ui/parser-recovery-1.stderr2
-rw-r--r--src/test/ui/parser/unclosed-braces.rs2
-rw-r--r--src/test/ui/parser/unclosed-braces.stderr2
6 files changed, 9 insertions, 6 deletions
diff --git a/src/libsyntax/parse/lexer/tokentrees.rs b/src/libsyntax/parse/lexer/tokentrees.rs
index 2999e65ae4a..e6ad3b9203e 100644
--- a/src/libsyntax/parse/lexer/tokentrees.rs
+++ b/src/libsyntax/parse/lexer/tokentrees.rs
@@ -58,7 +58,10 @@ impl<'a> StringReader<'a> {
                         .next()  // these are in reverse order as they get inserted on close, but
                     {            // we want the last open/first close
                         if d == delim {
-                            err.span_label(*open_sp, "this might be the culprit...");
+                            err.span_label(
+                                *open_sp,
+                                "this delimiter might not be properly closed...",
+                            );
                             err.span_label(
                                 *close_sp,
                                 "...as it matches this but it has different indentation",
diff --git a/src/test/ui/issue-2354.rs b/src/test/ui/issue-2354.rs
index 418f30df22b..35fddcb0de4 100644
--- a/src/test/ui/issue-2354.rs
+++ b/src/test/ui/issue-2354.rs
@@ -12,7 +12,7 @@
 
 fn foo() { //~ NOTE un-closed delimiter
   match Some(x) {
-  //~^ NOTE this might be the culprit...
+  //~^ NOTE this delimiter might not be properly closed...
       Some(y) => { panic!(); }
       None => { panic!(); }
 }
diff --git a/src/test/ui/issue-2354.stderr b/src/test/ui/issue-2354.stderr
index 720f37da9d3..9cf569b685b 100644
--- a/src/test/ui/issue-2354.stderr
+++ b/src/test/ui/issue-2354.stderr
@@ -4,7 +4,7 @@ error: this file contains an un-closed delimiter
 LL | fn foo() { //~ NOTE un-closed delimiter
    |          - un-closed delimiter
 LL |   match Some(x) {
-   |                 - this might be the culprit...
+   |                 - this delimiter might not be properly closed...
 ...
 LL | }
    | - ...as it matches this but it has different indentation
diff --git a/src/test/ui/parser-recovery-1.stderr b/src/test/ui/parser-recovery-1.stderr
index d0247b86ac3..5ba96e1a5dd 100644
--- a/src/test/ui/parser-recovery-1.stderr
+++ b/src/test/ui/parser-recovery-1.stderr
@@ -4,7 +4,7 @@ error: this file contains an un-closed delimiter
 LL | trait Foo {
    |           - un-closed delimiter
 LL |     fn bar() {
-   |              - this might be the culprit...
+   |              - this delimiter might not be properly closed...
 ...
 LL | }
    | - ...as it matches this but it has different indentation
diff --git a/src/test/ui/parser/unclosed-braces.rs b/src/test/ui/parser/unclosed-braces.rs
index 64089447584..802133ae6b9 100644
--- a/src/test/ui/parser/unclosed-braces.rs
+++ b/src/test/ui/parser/unclosed-braces.rs
@@ -24,7 +24,7 @@ fn main() {
 //~^ NOTE un-closed delimiter
     {
         {
-        //~^ NOTE this might be the culprit...
+        //~^ NOTE this delimiter might not be properly closed...
             foo();
     }
     //~^ NOTE ...as it matches this but it has different indentation
diff --git a/src/test/ui/parser/unclosed-braces.stderr b/src/test/ui/parser/unclosed-braces.stderr
index 5d5ff24faa6..4f865bc9b39 100644
--- a/src/test/ui/parser/unclosed-braces.stderr
+++ b/src/test/ui/parser/unclosed-braces.stderr
@@ -5,7 +5,7 @@ LL | fn main() {
    |           - un-closed delimiter
 ...
 LL |         {
-   |         - this might be the culprit...
+   |         - this delimiter might not be properly closed...
 ...
 LL |     }
    |     - ...as it matches this but it has different indentation