Skip to content

Commit 52e8ec1

Browse files
estebankestebank
committed
Remove "here" from "expected one of X here"
1 parent 3f0e164 commit 52e8ec1

File tree

132 files changed

+156
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+156
-156
lines changed

‎src/libsyntax/parse/parser/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ impl<'a> Parser<'a> {
289289
};
290290
(format!("expected one of {}, found {}", expect, actual),
291291
(self.sess.source_map().next_point(self.prev_span),
292-
format!("expected one of {} here", short_expect)))
292+
format!("expected one of {}", short_expect)))
293293
} else if expected.is_empty() {
294294
(format!("unexpected token: {}", actual),
295295
(self.prev_span, "unexpected token after this".to_string()))

‎src/test/ui/anon-params-denied-2018.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `:`, `@`, or `|`, found `)`
22
--> $DIR/anon-params-denied-2018.rs:6:15
33
|
44
LL | fn foo(i32);
5-
| ^ expected one of `:`, `@`, or `|` here
5+
| ^ expected one of `:`, `@`, or `|`
66
|
77
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
88
help: if this is a `self` type, give it a parameter name
@@ -22,7 +22,7 @@ error: expected one of `:`, `@`, or `|`, found `,`
2222
--> $DIR/anon-params-denied-2018.rs:8:36
2323
|
2424
LL | fn bar_with_default_impl(String, String) {}
25-
| ^ expected one of `:`, `@`, or `|` here
25+
| ^ expected one of `:`, `@`, or `|`
2626
|
2727
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
2828
help: if this is a `self` type, give it a parameter name
@@ -42,7 +42,7 @@ error: expected one of `:`, `@`, or `|`, found `)`
4242
--> $DIR/anon-params-denied-2018.rs:8:44
4343
|
4444
LL | fn bar_with_default_impl(String, String) {}
45-
| ^ expected one of `:`, `@`, or `|` here
45+
| ^ expected one of `:`, `@`, or `|`
4646
|
4747
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
4848
help: if this was a parameter name, give it a type
@@ -58,7 +58,7 @@ error: expected one of `:`, `@`, or `|`, found `,`
5858
--> $DIR/anon-params-denied-2018.rs:13:22
5959
|
6060
LL | fn baz(a:usize, b, c: usize) -> usize {
61-
| ^ expected one of `:`, `@`, or `|` here
61+
| ^ expected one of `:`, `@`, or `|`
6262
|
6363
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
6464
help: if this was a parameter name, give it a type

‎src/test/ui/async-await/await-keyword/incorrect-syntax-suggestions.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ error: expected one of `.`, `?`, `{`, or an operator, found `}`
130130
--> $DIR/incorrect-syntax-suggestions.rs:134:1
131131
|
132132
LL | match await { await => () }
133-
| ----- - expected one of `.`, `?`, `{`, or an operator here
133+
| ----- - expected one of `.`, `?`, `{`, or an operator
134134
| |
135135
| while parsing this match expression
136136
...

‎src/test/ui/async-await/no-async-const.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `fn` or `unsafe`, found keyword `const`
22
--> $DIR/no-async-const.rs:5:11
33
|
44
LL | pub async const fn x() {}
5-
| ^^^^^ expected one of `fn` or `unsafe` here
5+
| ^^^^^ expected one of `fn` or `unsafe`
66

77
error: aborting due to previous error
88

‎src/test/ui/async-await/no-unsafe-async.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error: expected one of `extern` or `fn`, found keyword `async`
22
--> $DIR/no-unsafe-async.rs:7:12
33
|
44
LL | unsafe async fn g() {}
5-
| ^^^^^ expected one of `extern` or `fn` here
5+
| ^^^^^ expected one of `extern` or `fn`
66

77
error: expected one of `extern`, `fn`, or `{`, found keyword `async`
88
--> $DIR/no-unsafe-async.rs:11:8
99
|
1010
LL | unsafe async fn f() {}
11-
| ^^^^^ expected one of `extern`, `fn`, or `{` here
11+
| ^^^^^ expected one of `extern`, `fn`, or `{`
1212

1313
error: aborting due to 2 previous errors
1414

‎src/test/ui/can-begin-expr-check.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found keyword `enum`
22
--> $DIR/can-begin-expr-check.rs:19:12
33
|
44
LL | return enum;
5-
| ^^^^ expected one of `.`, `;`, `?`, `}`, or an operator here
5+
| ^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
66

77
error: aborting due to previous error
88

‎src/test/ui/codemap_tests/bad-format-args.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ error: expected one of `,`, `.`, `?`, or an operator, found `1`
1616
--> $DIR/bad-format-args.rs:4:19
1717
|
1818
LL | format!("", 1 1);
19-
| ^ expected one of `,`, `.`, `?`, or an operator here
19+
| ^ expected one of `,`, `.`, `?`, or an operator
2020

2121
error: aborting due to 3 previous errors
2222

‎src/test/ui/const-generics/const-expression-parameter.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `,` or `>`, found `+`
22
--> $DIR/const-expression-parameter.rs:13:22
33
|
44
LL | i32_identity::<1 + 2>();
5-
| ^ expected one of `,` or `>` here
5+
| ^ expected one of `,` or `>`
66

77
warning: the feature `const_generics` is incomplete and may cause the compiler to crash
88
--> $DIR/const-expression-parameter.rs:1:12

‎src/test/ui/did_you_mean/issue-40006.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ error: expected one of `!` or `::`, found `(`
4848
--> $DIR/issue-40006.rs:28:9
4949
|
5050
LL | ::Y ();
51-
| ^ expected one of `!` or `::` here
51+
| ^ expected one of `!` or `::`
5252

5353
error: missing `fn`, `type`, or `const` for impl-item declaration
5454
--> $DIR/issue-40006.rs:32:8

‎src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ error: expected one of `!`, `)`, `,`, `.`, `::`, `?`, `{`, or an operator, found
2424
LL | if (a and b) {
2525
| ^^^
2626
| |
27-
| expected one of 8 possible tokens here
27+
| expected one of 8 possible tokens
2828
| help: use `&&` instead of `and` for the boolean operator
2929

3030
error: expected one of `!`, `)`, `,`, `.`, `::`, `?`, `{`, or an operator, found `or`
@@ -33,7 +33,7 @@ error: expected one of `!`, `)`, `,`, `.`, `::`, `?`, `{`, or an operator, found
3333
LL | if (a or b) {
3434
| ^^
3535
| |
36-
| expected one of 8 possible tokens here
36+
| expected one of 8 possible tokens
3737
| help: use `||` instead of `or` for the boolean operator
3838

3939
error: expected one of `!`, `.`, `::`, `?`, `{`, or an operator, found `and`
@@ -42,7 +42,7 @@ error: expected one of `!`, `.`, `::`, `?`, `{`, or an operator, found `and`
4242
LL | while a and b {
4343
| ^^^
4444
| |
45-
| expected one of `!`, `.`, `::`, `?`, `{`, or an operator here
45+
| expected one of `!`, `.`, `::`, `?`, `{`, or an operator
4646
| help: use `&&` instead of `and` for the boolean operator
4747

4848
error: expected one of `!`, `.`, `::`, `?`, `{`, or an operator, found `or`
@@ -51,7 +51,7 @@ error: expected one of `!`, `.`, `::`, `?`, `{`, or an operator, found `or`
5151
LL | while a or b {
5252
| ^^
5353
| |
54-
| expected one of `!`, `.`, `::`, `?`, `{`, or an operator here
54+
| expected one of `!`, `.`, `::`, `?`, `{`, or an operator
5555
| help: use `||` instead of `or` for the boolean operator
5656

5757
error: aborting due to 6 previous errors

‎src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ error: macro expansion ends with an incomplete expression: expected one of `move
3636
--> <::edition_kw_macro_2015::passes_ident macros>:1:22
3737
|
3838
LL | ($ i : ident) => ($ i)
39-
| ^ expected one of `move`, `|`, or `||` here
39+
| ^ expected one of `move`, `|`, or `||`
4040
|
4141
::: $DIR/edition-keywords-2018-2015-parsing.rs:16:8
4242
|

‎src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ error: macro expansion ends with an incomplete expression: expected one of `move
3636
--> <::edition_kw_macro_2018::passes_ident macros>:1:22
3737
|
3838
LL | ($ i : ident) => ($ i)
39-
| ^ expected one of `move`, `|`, or `||` here
39+
| ^ expected one of `move`, `|`, or `||`
4040
|
4141
::: $DIR/edition-keywords-2018-2018-parsing.rs:16:8
4242
|

‎src/test/ui/feature-gates/feature-gate-extern_prelude.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `!` or `::`, found `-`
22
--> $DIR/feature-gate-extern_prelude.rs:1:4
33
|
44
LL | can-only-test-this-in-run-make-fulldeps
5-
| ^ expected one of `!` or `::` here
5+
| ^ expected one of `!` or `::`
66

77
error: aborting due to previous error
88

‎src/test/ui/imports/import-prefix-macro-1.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `::`, `;`, or `as`, found `{`
22
--> $DIR/import-prefix-macro-1.rs:11:27
33
|
44
LL | ($p: path) => (use $p {S, Z});
5-
| ^^^^^^ expected one of `::`, `;`, or `as` here
5+
| ^^^^^^ expected one of `::`, `;`, or `as`
66
...
77
LL | import! { a::b::c }
88
| ------------------- in this macro invocation

‎src/test/ui/invalid/invalid-variadic-function.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error: expected one of `->`, `where`, or `{`, found `;`
88
--> $DIR/invalid-variadic-function.rs:1:30
99
|
1010
LL | extern "C" fn foo(x: u8, ...);
11-
| ^ expected one of `->`, `where`, or `{` here
11+
| ^ expected one of `->`, `where`, or `{`
1212

1313
error: aborting due to 2 previous errors
1414

‎src/test/ui/issues/issue-20616-1.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `,`, `:`, or `>`, found `T`
22
--> $DIR/issue-20616-1.rs:9:16
33
|
44
LL | type Type_1<'a T> = &'a T;
5-
| ^ expected one of `,`, `:`, or `>` here
5+
| ^ expected one of `,`, `:`, or `>`
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `,` or `>`, found `(`
22
--> $DIR/issue-20616-2.rs:12:31
33
|
44
LL | type Type_2 = Type_1_<'static ()>;
5-
| ^ expected one of `,` or `>` here
5+
| ^ expected one of `,` or `>`
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-3.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,`
22
--> $DIR/issue-20616-3.rs:13:24
33
|
44
LL | type Type_3<T> = Box<T,,>;
5-
| ^ expected one of `>`, const, identifier, lifetime, or type here
5+
| ^ expected one of `>`, const, identifier, lifetime, or type
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-4.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,`
22
--> $DIR/issue-20616-4.rs:16:34
33
|
44
LL | type Type_4<T> = Type_1_<'static,, T>;
5-
| ^ expected one of `>`, const, identifier, lifetime, or type here
5+
| ^ expected one of `>`, const, identifier, lifetime, or type
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-5.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,`
22
--> $DIR/issue-20616-5.rs:22:34
33
|
44
LL | type Type_5<'a> = Type_1_<'a, (),,>;
5-
| ^ expected one of `>`, const, identifier, lifetime, or type here
5+
| ^ expected one of `>`, const, identifier, lifetime, or type
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-6.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,`
22
--> $DIR/issue-20616-6.rs:25:26
33
|
44
LL | type Type_6 = Type_5_<'a,,>;
5-
| ^ expected one of `>`, const, identifier, lifetime, or type here
5+
| ^ expected one of `>`, const, identifier, lifetime, or type
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-7.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,`
22
--> $DIR/issue-20616-7.rs:28:22
33
|
44
LL | type Type_7 = Box<(),,>;
5-
| ^ expected one of `>`, const, identifier, lifetime, or type here
5+
| ^ expected one of `>`, const, identifier, lifetime, or type
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-8.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, `const`, identifier, or lifetime, found `,`
22
--> $DIR/issue-20616-8.rs:31:16
33
|
44
LL | type Type_8<'a,,> = &'a ();
5-
| ^ expected one of `>`, `const`, identifier, or lifetime here
5+
| ^ expected one of `>`, `const`, identifier, or lifetime
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-20616-9.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `>`, `const`, identifier, or lifetime, found `,`
22
--> $DIR/issue-20616-9.rs:34:15
33
|
44
LL | type Type_9<T,,> = Box<T>;
5-
| ^ expected one of `>`, `const`, identifier, or lifetime here
5+
| ^ expected one of `>`, `const`, identifier, or lifetime
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-21146.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `!` or `::`, found `<eof>`
22
--> $DIR/auxiliary/issue-21146-inc.rs:3:1
33
|
44
LL | parse_error
5-
| ^^^^^^^^^^^ expected one of `!` or `::` here
5+
| ^^^^^^^^^^^ expected one of `!` or `::`
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-34334.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ error: expected one of `,` or `>`, found `=`
1414
--> $DIR/issue-34334.rs:2:29
1515
|
1616
LL | let sr: Vec<(u32, _, _) = vec![];
17-
| --- ^ expected one of `,` or `>` here
17+
| --- ^ expected one of `,` or `>`
1818
| | |
1919
| | help: use `=` if you meant to assign
2020
| while parsing the type for `sr`

‎src/test/ui/issues/issue-39616.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error: expected one of `)`, `,`, `->`, `where`, or `{`, found `]`
88
--> $DIR/issue-39616.rs:1:16
99
|
1010
LL | fn foo(a: [0; 1]) {}
11-
| ^ expected one of `)`, `,`, `->`, `where`, or `{` here
11+
| ^ expected one of `)`, `,`, `->`, `where`, or `{`
1212

1313
error: aborting due to 2 previous errors
1414

‎src/test/ui/issues/issue-44021.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `:`, `@`, or `|`, found `}`
22
--> $DIR/issue-44021.rs:3:18
33
|
44
LL | fn f() {|x, y}
5-
| ^ expected one of `:`, `@`, or `|` here
5+
| ^ expected one of `:`, `@`, or `|`
66

77
error: aborting due to previous error
88

‎src/test/ui/issues/issue-52496.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error: expected one of `,` or `}`, found `.`
88
--> $DIR/issue-52496.rs:8:22
99
|
1010
LL | let _ = Foo { bar.into(), bat: -1, . };
11-
| --- ^ expected one of `,` or `}` here
11+
| --- ^ expected one of `,` or `}`
1212
| |
1313
| while parsing this struct
1414

‎src/test/ui/issues/issue-58856-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pu
1111
--> $DIR/issue-58856-2.rs:11:1
1212
|
1313
LL | }
14-
| - expected one of 10 possible tokens here
14+
| - expected one of 10 possible tokens
1515
LL | }
1616
| ^ unexpected token
1717

‎src/test/ui/issues/issue-60075.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `.`, `;`, `?`, `else`, or an operator, found `}`
22
--> $DIR/issue-60075.rs:6:10
33
|
44
LL | });
5-
| ^ expected one of `.`, `;`, `?`, `else`, or an operator here
5+
| ^ expected one of `.`, `;`, `?`, `else`, or an operator
66

77
error: expected one of `async`, `const`, `extern`, `fn`, `type`, `unsafe`, or `}`, found `;`
88
--> $DIR/issue-60075.rs:6:11

‎src/test/ui/label/label_break_value_illegal_uses.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected one of `extern`, `fn`, or `{`, found `'b`
22
--> $DIR/label_break_value_illegal_uses.rs:6:12
33
|
44
LL | unsafe 'b: {}
5-
| ^^ expected one of `extern`, `fn`, or `{` here
5+
| ^^ expected one of `extern`, `fn`, or `{`
66

77
error: expected `{`, found `'b`
88
--> $DIR/label_break_value_illegal_uses.rs:10:13
@@ -27,7 +27,7 @@ error: expected one of `.`, `?`, `{`, or an operator, found `'b`
2727
--> $DIR/label_break_value_illegal_uses.rs:18:17
2828
|
2929
LL | match false 'b: {}
30-
| ----- ^^ expected one of `.`, `?`, `{`, or an operator here
30+
| ----- ^^ expected one of `.`, `?`, `{`, or an operator
3131
| |
3232
| while parsing this match expression
3333

‎src/test/ui/macro_backtrace/main.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
33
|
44
LL | / macro_rules! pong {
55
LL | | () => { syntax error };
6-
| | ^^^^^ expected one of 8 possible tokens here
6+
| | ^^^^^ expected one of 8 possible tokens
77
LL | | }
88
| |_- in this expansion of `pong!`
99
...
@@ -15,7 +15,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
1515
|
1616
LL | / macro_rules! pong {
1717
LL | | () => { syntax error };
18-
| | ^^^^^ expected one of 8 possible tokens here
18+
| | ^^^^^ expected one of 8 possible tokens
1919
LL | | }
2020
| |_- in this expansion of `pong!`
2121
...
@@ -35,7 +35,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
3535
|
3636
LL | / macro_rules! pong {
3737
LL | | () => { syntax error };
38-
| | ^^^^^ expected one of 8 possible tokens here
38+
| | ^^^^^ expected one of 8 possible tokens
3939
LL | | }
4040
| |_- in this expansion of `pong!` (#5)
4141
...

0 commit comments

Comments
 (0)