Review comment

estebank · estebank · commit 44a086ef39b2 · 2019-03-22T19:50:18.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
    |

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: expected type, found `1`
`4`	`4`	`LL \| if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); }`
`5`	`5`	`\| ^ expecting a type here because of type ascription`
`6`	`6`	`\|`
`7`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`7`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`8`	`8`	`note: this expression is annotated with type ascription...`
`9`	`9`	`--> $DIR/E0423.rs:12:36`
`10`	`10`	`\|`
@@ -29,7 +29,7 @@ error: expected type, found `0`
`29`	`29`	`LL \| for _ in std::ops::Range { start: 0, end: 10 } {}`
`30`	`30`	`\| ^ expecting a type here because of type ascription`
`31`	`31`	`\|`
`32`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`32`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`33`	`33`	`note: this expression is annotated with type ascription...`
`34`	`34`	`--> $DIR/E0423.rs:21:32`
`35`	`35`	`\|`
Original file line number	Diff line number	Diff line change
@@ -89,7 +89,7 @@ error: expected type, found `4`
`89`	`89`	`LL \| println!("{}", a: &mut 4);`
`90`	`90`	`\| ^ expecting a type here because of type ascription`
`91`	`91`	`\|`
`92`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`92`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`93`	`93`	`note: this expression is annotated with type ascription...`
`94`	`94`	`--> $DIR/issue-22644.rs:34:20`
`95`	`95`	`\|`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: expected type, found `42`
`4`	`4`	`LL \| Test::Drill(field: 42);`
`5`	`5`	`\| ^^ expecting a type here because of type ascription`
`6`	`6`	`\|`
`7`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`7`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`8`	`8`	`note: this expression is annotated with type ascription...`
`9`	`9`	`--> $DIR/issue-34255-1.rs:8:17`
`10`	`10`	`\|`
Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ error: expected type, found keyword `loop`
`14`	`14`	`LL \| loop { break 'label: loop { break 'label 42; }; }`
`15`	`15`	`\| ^^^^ expecting a type here because of type ascription`
`16`	`16`	`\|`
`17`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`17`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`18`	`18`	`note: this expression is annotated with type ascription...`
`19`	`19`	`--> $DIR/lifetime_starts_expressions.rs:6:12`
`20`	`20`	`\|`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: expected type, found `3`
`4`	`4`	`LL \| x: 3`
`5`	`5`	`\| ^ expecting a type here because of type ascription`
`6`	`6`	`\|`
`7`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`7`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`8`	`8`	`note: this expression is annotated with type ascription...`
`9`	`9`	`--> $DIR/struct-literal-in-for.rs:13:9`
`10`	`10`	`\|`
Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ error: expected type, found `0`
`12`	`12`	`LL \| println!("test"): 0;`
`13`	`13`	`\| ^ expecting a type here because of type ascription`
`14`	`14`	`\|`
`15`		- = note: type ascription is a nightly only feature that lets you annotate expressions with a type: `<expr>: <type>`
	`15`	+ = note: type ascription is a nightly-only feature that lets you annotate an expression with a type: `<expr>: <type>`
`16`	`16`	`note: this expression is annotated with type ascription...`
`17`	`17`	`--> $DIR/type-ascription-instead-of-statement-end.rs:9:5`
`18`	`18`	`\|`