about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-03-19 18:16:55 -0700
committerEsteban Küber <esteban@kuber.com.ar>2019-03-22 19:50:18 -0700
commit44a086ef39b2a6e6ed231869a5166bec7c4b7511 (patch)
treef07061e57d793a7c1d7bb373ee36b87a85fae6bf
parent81b876b6a3e3e489fdad8514f69b67264ab1d338 (diff)
downloadrust-44a086ef39b2a6e6ed231869a5166bec7c4b7511.tar.gz
rust-44a086ef39b2a6e6ed231869a5166bec7c4b7511.zip
Review comment
-rw-r--r--src/libsyntax/parse/parser.rs4
-rw-r--r--src/test/ui/error-codes/E0423.stderr4
-rw-r--r--src/test/ui/issues/issue-22644.stderr2
-rw-r--r--src/test/ui/issues/issue-34255-1.stderr2
-rw-r--r--src/test/ui/lifetime_starts_expressions.stderr2
-rw-r--r--src/test/ui/parser/struct-literal-in-for.stderr2
-rw-r--r--src/test/ui/parser/struct-literal-in-if.stderr2
-rw-r--r--src/test/ui/parser/struct-literal-in-while.stderr2
-rw-r--r--src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr2
-rw-r--r--src/test/ui/type/type-ascription-instead-of-statement-end.stderr2
10 files changed, 12 insertions, 12 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d052abf96d7..d5b64eaaef5 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3704,8 +3704,8 @@ impl<'a> Parser<'a> {
                     Applicability::MaybeIncorrect,
                 );
             } else {
-                err.note("type ascription is a nightly only feature that lets \
-                            you annotate expressions with a type: `<expr>: <type>`");
+                err.note("type ascription is a nightly-only feature that lets \
+                          you annotate an expression with a type: `<expr>: <type>`");
                 err.span_note(
                     lhs_span,
                     "this expression is annotated with type ascription...",
diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr
index af5f88f4ce5..29a264ba162 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/src/test/ui/error-codes/E0423.stderr
@@ -4,7 +4,7 @@ error: expected type, found `1`
 LL |     if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); }
    |                                       ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/E0423.rs:12:36
    |
@@ -29,7 +29,7 @@ error: expected type, found `0`
 LL |     for _ in std::ops::Range { start: 0, end: 10 } {}
    |                                       ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/E0423.rs:21:32
    |
diff --git a/src/test/ui/issues/issue-22644.stderr b/src/test/ui/issues/issue-22644.stderr
index 08758ce9c94..5d40909f097 100644
--- a/src/test/ui/issues/issue-22644.stderr
+++ b/src/test/ui/issues/issue-22644.stderr
@@ -89,7 +89,7 @@ error: expected type, found `4`
 LL |     println!("{}", a: &mut 4);
    |                            ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/issue-22644.rs:34:20
    |
diff --git a/src/test/ui/issues/issue-34255-1.stderr b/src/test/ui/issues/issue-34255-1.stderr
index ea324302d40..15779705426 100644
--- a/src/test/ui/issues/issue-34255-1.stderr
+++ b/src/test/ui/issues/issue-34255-1.stderr
@@ -4,7 +4,7 @@ error: expected type, found `42`
 LL |     Test::Drill(field: 42);
    |                        ^^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/issue-34255-1.rs:8:17
    |
diff --git a/src/test/ui/lifetime_starts_expressions.stderr b/src/test/ui/lifetime_starts_expressions.stderr
index 3de3298e3b5..850e3563cab 100644
--- a/src/test/ui/lifetime_starts_expressions.stderr
+++ b/src/test/ui/lifetime_starts_expressions.stderr
@@ -14,7 +14,7 @@ error: expected type, found keyword `loop`
 LL |     loop { break 'label: loop { break 'label 42; }; }
    |                          ^^^^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/lifetime_starts_expressions.rs:6:12
    |
diff --git a/src/test/ui/parser/struct-literal-in-for.stderr b/src/test/ui/parser/struct-literal-in-for.stderr
index 2940f465826..9056fac4226 100644
--- a/src/test/ui/parser/struct-literal-in-for.stderr
+++ b/src/test/ui/parser/struct-literal-in-for.stderr
@@ -4,7 +4,7 @@ error: expected type, found `3`
 LL |         x: 3
    |            ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/struct-literal-in-for.rs:13:9
    |
diff --git a/src/test/ui/parser/struct-literal-in-if.stderr b/src/test/ui/parser/struct-literal-in-if.stderr
index e7d22ae0292..558f5a15cc5 100644
--- a/src/test/ui/parser/struct-literal-in-if.stderr
+++ b/src/test/ui/parser/struct-literal-in-if.stderr
@@ -4,7 +4,7 @@ error: expected type, found `3`
 LL |         x: 3
    |            ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/struct-literal-in-if.rs:13:9
    |
diff --git a/src/test/ui/parser/struct-literal-in-while.stderr b/src/test/ui/parser/struct-literal-in-while.stderr
index 038e30956ff..ae6e1d4577c 100644
--- a/src/test/ui/parser/struct-literal-in-while.stderr
+++ b/src/test/ui/parser/struct-literal-in-while.stderr
@@ -4,7 +4,7 @@ error: expected type, found `3`
 LL |         x: 3
    |            ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/struct-literal-in-while.rs:13:9
    |
diff --git a/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr b/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr
index b3a6f6ac734..6dbf7eb1b10 100644
--- a/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr
+++ b/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr
@@ -4,7 +4,7 @@ error: expected type, found `3`
 LL |         x: 3
    |            ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/struct-literal-restrictions-in-lamda.rs:13:9
    |
diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
index 4077be9d082..c80056e4487 100644
--- a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
+++ b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
@@ -12,7 +12,7 @@ error: expected type, found `0`
 LL |     println!("test"): 0;
    |                       ^ expecting a type here because of type ascription
    |
-   = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
+   = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
 note: this expression is annotated with type ascription...
   --> $DIR/type-ascription-instead-of-statement-end.rs:9:5
    |