Skip to content

Commit 041e54b

Browse files
estebankestebank
committed
Tweak wording of E0562
Fix #80476.
1 parent 79f38b7 commit 041e54b

40 files changed

+136
-136
lines changed

‎compiler/rustc_ast_lowering/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ast_lowering_misplaced_double_dot =
9999
.note = only allowed in tuple, tuple struct, and slice patterns
100100
101101
ast_lowering_misplaced_impl_trait =
102-
`impl Trait` only allowed in function and inherent method return types, not in {$position}
102+
`impl Trait` only allowed in function and inherent method argument and return types, not in {$position}
103103
104104
ast_lowering_misplaced_relax_trait_bound =
105105
`?Trait` bounds are only permitted at the point where a type parameter is declared

‎tests/ui/associated-consts/issue-105330.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ LL | fn main<A: TraitWAssocConst<A=32>>() {
3333
= note: see issue #92827 <https://github.com/rust-lang/rust/issues/92827> for more information
3434
= help: add `#![feature(associated_const_equality)]` to the crate attributes to enable
3535

36-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in impl headers
36+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in impl headers
3737
--> $DIR/issue-105330.rs:6:27
3838
|
3939
LL | impl TraitWAssocConst for impl Demo {

‎tests/ui/async-await/in-trait/fn-not-async-err2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ trait MyTrait {
1111

1212
impl MyTrait for i32 {
1313
fn foo(&self) -> impl Future<Output = i32> {
14-
//~^ ERROR `impl Trait` only allowed in function and inherent method return types, not in `impl` method return types
14+
//~^ ERROR `impl Trait` only allowed in function and inherent method argument and return types, not in `impl` method return types
1515
async { *self }
1616
}
1717
}

‎tests/ui/async-await/in-trait/fn-not-async-err2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in `impl` method return types
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in `impl` method return types
22
--> $DIR/fn-not-async-err2.rs:13:22
33
|
44
LL | fn foo(&self) -> impl Future<Output = i32> {

‎tests/ui/feature-gates/feature-gate-associated_type_bounds.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ fn _rpit_dyn() -> Box<dyn Tr1<As1: Copy>> { Box::new(S1) }
5454

5555
const _cdef: impl Tr1<As1: Copy> = S1;
5656
//~^ ERROR associated type bounds are unstable
57-
//~| ERROR `impl Trait` only allowed in function and inherent method return types
57+
//~| ERROR `impl Trait` only allowed in function and inherent method argument and return types
5858
// FIXME: uncomment when `impl_trait_in_bindings` feature is fixed.
5959
// const _cdef_dyn: &dyn Tr1<As1: Copy> = &S1;
6060

6161
static _sdef: impl Tr1<As1: Copy> = S1;
6262
//~^ ERROR associated type bounds are unstable
63-
//~| ERROR `impl Trait` only allowed in function and inherent method return types
63+
//~| ERROR `impl Trait` only allowed in function and inherent method argument and return types
6464
// FIXME: uncomment when `impl_trait_in_bindings` feature is fixed.
6565
// static _sdef_dyn: &dyn Tr1<As1: Copy> = &S1;
6666

6767
fn main() {
6868
let _: impl Tr1<As1: Copy> = S1;
6969
//~^ ERROR associated type bounds are unstable
70-
//~| ERROR `impl Trait` only allowed in function and inherent method return types
70+
//~| ERROR `impl Trait` only allowed in function and inherent method argument and return types
7171
// FIXME: uncomment when `impl_trait_in_bindings` feature is fixed.
7272
// let _: &dyn Tr1<As1: Copy> = &S1;
7373
}

‎tests/ui/feature-gates/feature-gate-associated_type_bounds.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@ LL | let _: impl Tr1<As1: Copy> = S1;
115115
= note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
116116
= help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
117117

118-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in const types
118+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in const types
119119
--> $DIR/feature-gate-associated_type_bounds.rs:55:14
120120
|
121121
LL | const _cdef: impl Tr1<As1: Copy> = S1;
122122
| ^^^^^^^^^^^^^^^^^^^
123123

124-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in const types
124+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in const types
125125
--> $DIR/feature-gate-associated_type_bounds.rs:61:15
126126
|
127127
LL | static _sdef: impl Tr1<As1: Copy> = S1;
128128
| ^^^^^^^^^^^^^^^^^^^
129129

130-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
130+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
131131
--> $DIR/feature-gate-associated_type_bounds.rs:68:12
132132
|
133133
LL | let _: impl Tr1<As1: Copy> = S1;

‎tests/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn f() -> impl Fn() -> impl Sized { || () }
2-
//~^ ERROR `impl Trait` only allowed in function and inherent method return types, not in `Fn` trait return
2+
//~^ ERROR `impl Trait` only allowed in function and inherent method argument and return types, not in `Fn` trait return
33
fn g() -> &'static dyn Fn() -> impl Sized { &|| () }
4-
//~^ ERROR `impl Trait` only allowed in function and inherent method return types, not in `Fn` trait return
4+
//~^ ERROR `impl Trait` only allowed in function and inherent method argument and return types, not in `Fn` trait return
55

66
fn main() {}

‎tests/ui/feature-gates/feature-gate-impl_trait_in_fn_trait_return.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in `Fn` trait return types
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in `Fn` trait return types
22
--> $DIR/feature-gate-impl_trait_in_fn_trait_return.rs:1:24
33
|
44
LL | fn f() -> impl Fn() -> impl Sized { || () }
@@ -7,7 +7,7 @@ LL | fn f() -> impl Fn() -> impl Sized { || () }
77
= note: see issue #99697 <https://github.com/rust-lang/rust/issues/99697> for more information
88
= help: add `#![feature(impl_trait_in_fn_trait_return)]` to the crate attributes to enable
99

10-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in `Fn` trait return types
10+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in `Fn` trait return types
1111
--> $DIR/feature-gate-impl_trait_in_fn_trait_return.rs:3:32
1212
|
1313
LL | fn g() -> &'static dyn Fn() -> impl Sized { &|| () }

‎tests/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#![feature(async_fn_in_trait)]
66

77
trait Foo {
8-
fn bar() -> impl Sized; //~ ERROR `impl Trait` only allowed in function and inherent method return types, not in trait method return
9-
fn baz() -> Box<impl std::fmt::Display>; //~ ERROR `impl Trait` only allowed in function and inherent method return types, not in trait method return
8+
fn bar() -> impl Sized; //~ ERROR `impl Trait` only allowed in function and inherent method argument and return types, not in trait method return
9+
fn baz() -> Box<impl std::fmt::Display>; //~ ERROR `impl Trait` only allowed in function and inherent method argument and return types, not in trait method return
1010
}
1111

1212
// Both return_position_impl_trait_in_trait and async_fn_in_trait are required for this (see also
1313
// feature-gate-async_fn_in_trait.rs)
1414
trait AsyncFoo {
15-
async fn bar() -> impl Sized; //~ ERROR `impl Trait` only allowed in function and inherent method return types, not in trait method return
15+
async fn bar() -> impl Sized; //~ ERROR `impl Trait` only allowed in function and inherent method argument and return types, not in trait method return
1616
}
1717

1818
fn main() {}

‎tests/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in trait method return types
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in trait method return types
22
--> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:8:17
33
|
44
LL | fn bar() -> impl Sized;
@@ -7,7 +7,7 @@ LL | fn bar() -> impl Sized;
77
= note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
88
= help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable
99

10-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in trait method return types
10+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in trait method return types
1111
--> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:9:21
1212
|
1313
LL | fn baz() -> Box<impl std::fmt::Display>;
@@ -16,7 +16,7 @@ LL | fn baz() -> Box<impl std::fmt::Display>;
1616
= note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
1717
= help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable
1818

19-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in trait method return types
19+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in trait method return types
2020
--> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:15:23
2121
|
2222
LL | async fn bar() -> impl Sized;

‎tests/ui/impl-trait/issues/issue-54600.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ use std::fmt::Debug;
22

33
fn main() {
44
let x: Option<impl Debug> = Some(44_u32);
5-
//~^ `impl Trait` only allowed in function and inherent method return types
5+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
66
println!("{:?}", x);
77
}

‎tests/ui/impl-trait/issues/issue-54600.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
22
--> $DIR/issue-54600.rs:4:19
33
|
44
LL | let x: Option<impl Debug> = Some(44_u32);

‎tests/ui/impl-trait/issues/issue-54840.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ use std::ops::Add;
33
fn main() {
44
let i: i32 = 0;
55
let j: &impl Add = &i;
6-
//~^ `impl Trait` only allowed in function and inherent method return types
6+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
77
}

‎tests/ui/impl-trait/issues/issue-54840.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
22
--> $DIR/issue-54840.rs:5:13
33
|
44
LL | let j: &impl Add = &i;

‎tests/ui/impl-trait/issues/issue-58504.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ fn mk_gen() -> impl Generator<Return=!, Yield=()> {
88

99
fn main() {
1010
let gens: [impl Generator<Return=!, Yield=()>;2] = [ mk_gen(), mk_gen() ];
11-
//~^ `impl Trait` only allowed in function and inherent method return types
11+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
1212
}

‎tests/ui/impl-trait/issues/issue-58504.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
22
--> $DIR/issue-58504.rs:10:16
33
|
44
LL | let gens: [impl Generator<Return=!, Yield=()>;2] = [ mk_gen(), mk_gen() ];

‎tests/ui/impl-trait/issues/issue-58956.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ impl Lam for B {}
55
pub struct Wrap<T>(T);
66

77
const _A: impl Lam = {
8-
//~^ `impl Trait` only allowed in function and inherent method return types
8+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
99
let x: Wrap<impl Lam> = Wrap(B);
10-
//~^ `impl Trait` only allowed in function and inherent method return types
10+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
1111
x.0
1212
};
1313

‎tests/ui/impl-trait/issues/issue-58956.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in const types
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in const types
22
--> $DIR/issue-58956.rs:7:11
33
|
44
LL | const _A: impl Lam = {
55
| ^^^^^^^^
66

7-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
7+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
88
--> $DIR/issue-58956.rs:9:17
99
|
1010
LL | let x: Wrap<impl Lam> = Wrap(B);

‎tests/ui/impl-trait/issues/issue-70971.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fn main() {
22
let x : (impl Copy,) = (true,);
3-
//~^ `impl Trait` only allowed in function and inherent method return types
3+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
44
}

‎tests/ui/impl-trait/issues/issue-70971.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
22
--> $DIR/issue-70971.rs:2:14
33
|
44
LL | let x : (impl Copy,) = (true,);

‎tests/ui/impl-trait/issues/issue-79099.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
struct Bug {
22
V1: [(); {
33
let f: impl core::future::Future<Output = u8> = async { 1 };
4-
//~^ `impl Trait` only allowed in function and inherent method return types
4+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
55
//~| expected identifier
66
1
77
}],

‎tests/ui/impl-trait/issues/issue-79099.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | let f: impl core::future::Future<Output = u8> = async { 1 };
99
= help: pass `--edition 2021` to `rustc`
1010
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
1111

12-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
12+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
1313
--> $DIR/issue-79099.rs:3:16
1414
|
1515
LL | let f: impl core::future::Future<Output = u8> = async { 1 };

‎tests/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
struct Foo<T = impl Copy>(T);
2-
//~^ ERROR `impl Trait` only allowed in function and inherent method return types
2+
//~^ ERROR `impl Trait` only allowed in function and inherent method argument and return types
33

44
type Result<T, E = impl std::error::Error> = std::result::Result<T, E>;
5-
//~^ ERROR `impl Trait` only allowed in function and inherent method return types
5+
//~^ ERROR `impl Trait` only allowed in function and inherent method argument and return types
66

77
// should not cause ICE
88
fn x() -> Foo {

‎tests/ui/impl-trait/issues/issue-83929-impl-trait-in-generic-default.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in generic parameter defaults
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in generic parameter defaults
22
--> $DIR/issue-83929-impl-trait-in-generic-default.rs:1:16
33
|
44
LL | struct Foo<T = impl Copy>(T);
55
| ^^^^^^^^^
66

7-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in generic parameter defaults
7+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in generic parameter defaults
88
--> $DIR/issue-83929-impl-trait-in-generic-default.rs:4:20
99
|
1010
LL | type Result<T, E = impl std::error::Error> = std::result::Result<T, E>;

‎tests/ui/impl-trait/issues/issue-84919.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ impl Trait for () {}
33

44
fn foo<'a: 'a>() {
55
let _x: impl Trait = ();
6-
//~^ `impl Trait` only allowed in function and inherent method return types
6+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
77
}
88

99
fn main() {}

‎tests/ui/impl-trait/issues/issue-84919.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
22
--> $DIR/issue-84919.rs:5:13
33
|
44
LL | let _x: impl Trait = ();

‎tests/ui/impl-trait/issues/issue-86642.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
static x: impl Fn(&str) -> Result<&str, ()> = move |source| {
2-
//~^ `impl Trait` only allowed in function and inherent method return types
2+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
33
let res = (move |source| Ok(source))(source);
44
let res = res.or((move |source| Ok(source))(source));
55
res

‎tests/ui/impl-trait/issues/issue-86642.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in const types
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in const types
22
--> $DIR/issue-86642.rs:1:11
33
|
44
LL | static x: impl Fn(&str) -> Result<&str, ()> = move |source| {

‎tests/ui/impl-trait/issues/issue-87295.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ impl<F> Struct<F> {
1414

1515
fn main() {
1616
let _do_not_waste: Struct<impl Trait<Output = i32>> = Struct::new(());
17-
//~^ `impl Trait` only allowed in function and inherent method return types
17+
//~^ `impl Trait` only allowed in function and inherent method argument and return types
1818
}

‎tests/ui/impl-trait/issues/issue-87295.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in variable bindings
1+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in variable bindings
22
--> $DIR/issue-87295.rs:16:31
33
|
44
LL | let _do_not_waste: Struct<impl Trait<Output = i32>> = Struct::new(());

‎tests/ui/impl-trait/nested_impl_trait.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn bad_in_ret_position(x: impl Into<u32>) -> impl Into<impl Debug> { x }
99

1010
fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
1111
//~^ ERROR nested `impl Trait` is not allowed
12-
//~| `impl Trait` only allowed in function and inherent method return types
12+
//~| `impl Trait` only allowed in function and inherent method argument and return types
1313

1414
fn bad_in_arg_position(_: impl Into<impl Debug>) { }
1515
//~^ ERROR nested `impl Trait` is not allowed

‎tests/ui/impl-trait/nested_impl_trait.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ LL | fn bad(x: impl Into<u32>) -> impl Into<impl Debug> { x }
3434
| | nested `impl Trait` here
3535
| outer `impl Trait`
3636

37-
error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in `fn` pointer return types
37+
error[E0562]: `impl Trait` only allowed in function and inherent method argument and return types, not in `fn` pointer return types
3838
--> $DIR/nested_impl_trait.rs:10:32
3939
|
4040
LL | fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}

0 commit comments

Comments
 (0)