Skip to content

Commit 4897415

Browse files
committed
Adjust wording for review
1 parent 7cbd0dc commit 4897415

File tree

3 files changed

+33
-30
lines changed

3 files changed

+33
-30
lines changed

Diff for: compiler/rustc_typeck/src/check/wfcheck.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,12 @@ fn check_gat_where_clauses(
487487
);
488488

489489
let bound = if clauses.len() > 1 { "these bounds are" } else { "this bound is" };
490-
err.note(&format!("{} required to ensure that impls have maximum flexibility", bound));
490+
err.note(&format!(
491+
"{} currently required to ensure that impls have maximum flexibility",
492+
bound
493+
));
491494
err.note(
492-
"see issue #87479 \
495+
"we are soliciting feedback, see issue #87479 \
493496
<https://github.com/rust-lang/rust/issues/87479> \
494497
for more information",
495498
);

Diff for: src/test/ui/generic-associated-types/issue-86787.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | type TRef<'a>;
66
| |
77
| help: add the required where clause: `where Self: 'a`
88
|
9-
= note: this bound is required to ensure that impls have maximum flexibility
10-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
9+
= note: this bound is currently required to ensure that impls have maximum flexibility
10+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
1111

1212
error: aborting due to previous error
1313

Diff for: src/test/ui/generic-associated-types/self-outlives-lint.stderr

+26-26
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LL | type Item<'x>;
66
| |
77
| help: add the required where clause: `where Self: 'x`
88
|
9-
= note: this bound is required to ensure that impls have maximum flexibility
10-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
9+
= note: this bound is currently required to ensure that impls have maximum flexibility
10+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
1111

1212
error: missing required bound on `Out`
1313
--> $DIR/self-outlives-lint.rs:25:5
@@ -17,8 +17,8 @@ LL | type Out<'x>;
1717
| |
1818
| help: add the required where clause: `where T: 'x`
1919
|
20-
= note: this bound is required to ensure that impls have maximum flexibility
21-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
20+
= note: this bound is currently required to ensure that impls have maximum flexibility
21+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
2222

2323
error: missing required bound on `Out`
2424
--> $DIR/self-outlives-lint.rs:39:5
@@ -28,8 +28,8 @@ LL | type Out<'x>;
2828
| |
2929
| help: add the required where clause: `where T: 'x`
3030
|
31-
= note: this bound is required to ensure that impls have maximum flexibility
32-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
31+
= note: this bound is currently required to ensure that impls have maximum flexibility
32+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
3333

3434
error: missing required bounds on `Out`
3535
--> $DIR/self-outlives-lint.rs:46:5
@@ -39,8 +39,8 @@ LL | type Out<'x, 'y>;
3939
| |
4040
| help: add the required where clauses: `where T: 'x, U: 'y`
4141
|
42-
= note: these bounds are required to ensure that impls have maximum flexibility
43-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
42+
= note: these bounds are currently required to ensure that impls have maximum flexibility
43+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
4444

4545
error: missing required bound on `Out`
4646
--> $DIR/self-outlives-lint.rs:61:5
@@ -50,8 +50,8 @@ LL | type Out<'x, D>;
5050
| |
5151
| help: add the required where clause: `where D: 'x`
5252
|
53-
= note: this bound is required to ensure that impls have maximum flexibility
54-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
53+
= note: this bound is currently required to ensure that impls have maximum flexibility
54+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
5555

5656
error: missing required bound on `Out`
5757
--> $DIR/self-outlives-lint.rs:77:5
@@ -61,8 +61,8 @@ LL | type Out<'x, D>;
6161
| |
6262
| help: add the required where clause: `where D: 'x`
6363
|
64-
= note: this bound is required to ensure that impls have maximum flexibility
65-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
64+
= note: this bound is currently required to ensure that impls have maximum flexibility
65+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
6666

6767
error: missing required bound on `Out`
6868
--> $DIR/self-outlives-lint.rs:92:5
@@ -72,8 +72,8 @@ LL | type Out<'x, D>;
7272
| |
7373
| help: add the required where clause: `where D: 'x`
7474
|
75-
= note: this bound is required to ensure that impls have maximum flexibility
76-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
75+
= note: this bound is currently required to ensure that impls have maximum flexibility
76+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
7777

7878
error: missing required bounds on `Bar`
7979
--> $DIR/self-outlives-lint.rs:114:5
@@ -83,8 +83,8 @@ LL | type Bar<'b>;
8383
| |
8484
| help: add the required where clauses: `where Self: 'a, Self: 'b`
8585
|
86-
= note: these bounds are required to ensure that impls have maximum flexibility
87-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
86+
= note: these bounds are currently required to ensure that impls have maximum flexibility
87+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
8888

8989
error: missing required bound on `Bar`
9090
--> $DIR/self-outlives-lint.rs:122:5
@@ -94,8 +94,8 @@ LL | type Bar<'b>;
9494
| |
9595
| help: add the required where clause: `where Self: 'b`
9696
|
97-
= note: this bound is required to ensure that impls have maximum flexibility
98-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
97+
= note: this bound is currently required to ensure that impls have maximum flexibility
98+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
9999

100100
error: missing required bound on `Bar`
101101
--> $DIR/self-outlives-lint.rs:129:5
@@ -105,8 +105,8 @@ LL | type Bar<'b>;
105105
| |
106106
| help: add the required where clause: `where Self: 'b`
107107
|
108-
= note: this bound is required to ensure that impls have maximum flexibility
109-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
108+
= note: this bound is currently required to ensure that impls have maximum flexibility
109+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
110110

111111
error: missing required bound on `Iterator`
112112
--> $DIR/self-outlives-lint.rs:143:5
@@ -116,8 +116,8 @@ LL | type Iterator<'a>: Iterator<Item = Self::Item<'a>>;
116116
| |
117117
| help: add the required where clause: `where Self: 'a`
118118
|
119-
= note: this bound is required to ensure that impls have maximum flexibility
120-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
119+
= note: this bound is currently required to ensure that impls have maximum flexibility
120+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
121121

122122
error: missing required bound on `Bar`
123123
--> $DIR/self-outlives-lint.rs:151:5
@@ -127,8 +127,8 @@ LL | type Bar<'a, 'b>;
127127
| |
128128
| help: add the required where clause: `where 'b: 'a`
129129
|
130-
= note: this bound is required to ensure that impls have maximum flexibility
131-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
130+
= note: this bound is currently required to ensure that impls have maximum flexibility
131+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
132132

133133
error: missing required bound on `Fut`
134134
--> $DIR/self-outlives-lint.rs:167:5
@@ -138,8 +138,8 @@ LL | type Fut<'out>;
138138
| |
139139
| help: add the required where clause: `where 'ctx: 'out`
140140
|
141-
= note: this bound is required to ensure that impls have maximum flexibility
142-
= note: see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
141+
= note: this bound is currently required to ensure that impls have maximum flexibility
142+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
143143

144144
error: aborting due to 13 previous errors
145145

0 commit comments

Comments
 (0)