Skip to content

Commit adf7ddc

Browse files
fmeasefmease
committed
Detect empty leading where-clauses on type aliases
1 parent 8d0d4ce commit adf7ddc

File tree

11 files changed

+166
-67
lines changed

11 files changed

+166
-67
lines changed

‎compiler/rustc_ast_passes/messages.ftl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,4 +280,5 @@ ast_passes_where_clause_after_type_alias = where clauses are not allowed after t
280280
281281
ast_passes_where_clause_before_type_alias = where clauses are not allowed before the type for type aliases
282282
.note = see issue #89122 <https://github.com/rust-lang/rust/issues/89122> for more information
283-
.suggestion = move it to the end of the type declaration
283+
.remove_suggestion = remove this `where`
284+
.move_suggestion = move it to the end of the type declaration

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -138,38 +138,41 @@ impl<'a> AstValidator<'a> {
138138
&mut self,
139139
ty_alias: &TyAlias,
140140
) -> Result<(), errors::WhereClauseBeforeTypeAlias> {
141-
let before_predicates =
142-
ty_alias.generics.where_clause.predicates.split_at(ty_alias.where_clauses.split).0;
143-
144-
if ty_alias.ty.is_none() || before_predicates.is_empty() {
141+
if ty_alias.ty.is_none() || !ty_alias.where_clauses.before.has_where_token {
145142
return Ok(());
146143
}
147144

148-
let mut state = State::new();
149-
if !ty_alias.where_clauses.after.has_where_token {
150-
state.space();
151-
state.word_space("where");
152-
} else {
153-
state.word_space(",");
154-
}
155-
let mut first = true;
156-
for p in before_predicates {
157-
if !first {
158-
state.word_space(",");
145+
let (before_predicates, after_predicates) =
146+
ty_alias.generics.where_clause.predicates.split_at(ty_alias.where_clauses.split);
147+
let span = ty_alias.where_clauses.before.span;
148+
149+
let sugg = if !before_predicates.is_empty() {
150+
let mut state = State::new();
151+
152+
if !ty_alias.where_clauses.after.has_where_token {
153+
state.space();
154+
state.word_space("where");
159155
}
160-
first = false;
161-
state.print_where_predicate(p);
162-
}
163156

164-
let span = ty_alias.where_clauses.before.span;
165-
Err(errors::WhereClauseBeforeTypeAlias {
166-
span,
167-
sugg: errors::WhereClauseBeforeTypeAliasSugg {
157+
let mut first = after_predicates.is_empty();
158+
for p in before_predicates {
159+
if !first {
160+
state.word_space(",");
161+
}
162+
first = false;
163+
state.print_where_predicate(p);
164+
}
165+
166+
errors::WhereClauseBeforeTypeAliasSugg::Move {
168167
left: span,
169168
snippet: state.s.eof(),
170169
right: ty_alias.where_clauses.after.span.shrink_to_hi(),
171-
},
172-
})
170+
}
171+
} else {
172+
errors::WhereClauseBeforeTypeAliasSugg::Remove { span }
173+
};
174+
175+
Err(errors::WhereClauseBeforeTypeAlias { span, sugg })
173176
}
174177

175178
fn with_impl_trait(&mut self, outer: Option<Span>, f: impl FnOnce(&mut Self)) {
@@ -1475,15 +1478,18 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
14751478
if let AssocItemKind::Type(ty_alias) = &item.kind
14761479
&& let Err(err) = self.check_type_alias_where_clause_location(ty_alias)
14771480
{
1481+
let sugg = match err.sugg {
1482+
errors::WhereClauseBeforeTypeAliasSugg::Remove { .. } => None,
1483+
errors::WhereClauseBeforeTypeAliasSugg::Move { snippet, right, .. } => {
1484+
Some((right, snippet))
1485+
}
1486+
};
14781487
self.lint_buffer.buffer_lint_with_diagnostic(
14791488
DEPRECATED_WHERE_CLAUSE_LOCATION,
14801489
item.id,
14811490
err.span,
14821491
fluent::ast_passes_deprecated_where_clause_location,
1483-
BuiltinLintDiagnostics::DeprecatedWhereclauseLocation(
1484-
err.sugg.right,
1485-
err.sugg.snippet,
1486-
),
1492+
BuiltinLintDiagnostics::DeprecatedWhereclauseLocation(sugg),
14871493
);
14881494
}
14891495

‎compiler/rustc_ast_passes/src/errors.rs‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -509,17 +509,25 @@ pub struct WhereClauseBeforeTypeAlias {
509509
}
510510

511511
#[derive(Subdiagnostic)]
512-
#[multipart_suggestion(
513-
ast_passes_suggestion,
514-
applicability = "machine-applicable",
515-
style = "verbose"
516-
)]
517-
pub struct WhereClauseBeforeTypeAliasSugg {
518-
#[suggestion_part(code = "")]
519-
pub left: Span,
520-
pub snippet: String,
521-
#[suggestion_part(code = "{snippet}")]
522-
pub right: Span,
512+
513+
pub enum WhereClauseBeforeTypeAliasSugg {
514+
#[suggestion(ast_passes_remove_suggestion, applicability = "machine-applicable", code = "")]
515+
Remove {
516+
#[primary_span]
517+
span: Span,
518+
},
519+
#[multipart_suggestion(
520+
ast_passes_move_suggestion,
521+
applicability = "machine-applicable",
522+
style = "verbose"
523+
)]
524+
Move {
525+
#[suggestion_part(code = "")]
526+
left: Span,
527+
snippet: String,
528+
#[suggestion_part(code = "{snippet}")]
529+
right: Span,
530+
},
523531
}
524532

525533
#[derive(Diagnostic)]

‎compiler/rustc_lint/src/context/diagnostics.rs‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -427,15 +427,22 @@ pub(super) fn builtin(
427427
db.note("see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration");
428428
}
429429
}
430-
BuiltinLintDiagnostics::DeprecatedWhereclauseLocation(new_span, suggestion) => {
431-
db.multipart_suggestion(
432-
"move it to the end of the type declaration",
433-
vec![(db.span.primary_span().unwrap(), "".to_string()), (new_span, suggestion)],
434-
Applicability::MachineApplicable,
435-
);
436-
db.note(
437-
"see issue #89122 <https://github.com/rust-lang/rust/issues/89122> for more information",
438-
);
430+
BuiltinLintDiagnostics::DeprecatedWhereclauseLocation(sugg) => {
431+
let left_sp = db.span.primary_span().unwrap();
432+
match sugg {
433+
Some((right_sp, sugg)) => db.multipart_suggestion(
434+
"move it to the end of the type declaration",
435+
vec![(left_sp, String::new()), (right_sp, sugg)],
436+
Applicability::MachineApplicable,
437+
),
438+
None => db.span_suggestion(
439+
left_sp,
440+
"remove this `where`",
441+
"",
442+
Applicability::MachineApplicable,
443+
),
444+
};
445+
db.note("see issue #89122 <https://github.com/rust-lang/rust/issues/89122> for more information");
439446
}
440447
BuiltinLintDiagnostics::SingleUseLifetime {
441448
param_span,

‎compiler/rustc_lint_defs/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ pub enum BuiltinLintDiagnostics {
593593
UnicodeTextFlow(Span, String),
594594
UnexpectedCfgName((Symbol, Span), Option<(Symbol, Span)>),
595595
UnexpectedCfgValue((Symbol, Span), Option<(Symbol, Span)>),
596-
DeprecatedWhereclauseLocation(Span, String),
596+
DeprecatedWhereclauseLocation(Option<(Span, String)>),
597597
SingleUseLifetime {
598598
/// Span of the parameter which declares this lifetime.
599599
param_span: Span,

‎tests/ui/lazy-type-alias/leading-where-clause.fixed‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22

33
#![feature(lazy_type_alias)]
44
#![allow(incomplete_features)]
5+
#![crate_type = "lib"]
56

67
// Check that we *reject* leading where-clauses on lazy type aliases.
78

8-
type Alias<T>
9+
pub type Leading0<T>
910

1011
= T where String: From<T>;
11-
//~^^^ ERROR where clauses are not allowed before the type for type aliases
1212

13-
fn main() {
14-
let _: Alias<&str>;
15-
}
13+
pub type Leading1<T, U>
14+
15+
= (T, U)
16+
where
17+
U: Copy, String: From<T>;
18+
19+
pub type EmptyLeading0 = ();
20+
//~^ ERROR where clauses are not allowed before the type for type aliases
21+
22+
pub type EmptyLeading1<T> = T where T: Copy;
23+
//~^ ERROR where clauses are not allowed before the type for type aliases

‎tests/ui/lazy-type-alias/leading-where-clause.rs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,24 @@
22

33
#![feature(lazy_type_alias)]
44
#![allow(incomplete_features)]
5+
#![crate_type = "lib"]
56

67
// Check that we *reject* leading where-clauses on lazy type aliases.
78

8-
type Alias<T>
9-
where
9+
pub type Leading0<T>
10+
where //~ ERROR where clauses are not allowed before the type for type aliases
1011
String: From<T>,
1112
= T;
12-
//~^^^ ERROR where clauses are not allowed before the type for type aliases
1313

14-
fn main() {
15-
let _: Alias<&str>;
16-
}
14+
pub type Leading1<T, U>
15+
where //~ ERROR where clauses are not allowed before the type for type aliases
16+
String: From<T>,
17+
= (T, U)
18+
where
19+
U: Copy;
20+
21+
pub type EmptyLeading0 where = ();
22+
//~^ ERROR where clauses are not allowed before the type for type aliases
23+
24+
pub type EmptyLeading1<T> where = T where T: Copy;
25+
//~^ ERROR where clauses are not allowed before the type for type aliases

‎tests/ui/lazy-type-alias/leading-where-clause.stderr‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: where clauses are not allowed before the type for type aliases
2-
--> $DIR/leading-where-clause.rs:9:1
2+
--> $DIR/leading-where-clause.rs:10:1
33
|
44
LL | / where
55
LL | | String: From<T>,
@@ -12,5 +12,37 @@ LL +
1212
LL ~ = T where String: From<T>;
1313
|
1414

15-
error: aborting due to 1 previous error
15+
error: where clauses are not allowed before the type for type aliases
16+
--> $DIR/leading-where-clause.rs:15:1
17+
|
18+
LL | / where
19+
LL | | String: From<T>,
20+
| |____________________^
21+
|
22+
= note: see issue #89122 <https://github.com/rust-lang/rust/issues/89122> for more information
23+
help: move it to the end of the type declaration
24+
|
25+
LL +
26+
LL | = (T, U)
27+
LL | where
28+
LL ~ U: Copy, String: From<T>;
29+
|
30+
31+
error: where clauses are not allowed before the type for type aliases
32+
--> $DIR/leading-where-clause.rs:21:24
33+
|
34+
LL | pub type EmptyLeading0 where = ();
35+
| ^^^^^ help: remove this `where`
36+
|
37+
= note: see issue #89122 <https://github.com/rust-lang/rust/issues/89122> for more information
38+
39+
error: where clauses are not allowed before the type for type aliases
40+
--> $DIR/leading-where-clause.rs:24:27
41+
|
42+
LL | pub type EmptyLeading1<T> where = T where T: Copy;
43+
| ^^^^^ help: remove this `where`
44+
|
45+
= note: see issue #89122 <https://github.com/rust-lang/rust/issues/89122> for more information
46+
47+
error: aborting due to 4 previous errors
1648

‎tests/ui/where-clauses/where-clause-placement-assoc-type-in-impl.fixed‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ trait Trait {
88
type Assoc where u32: Copy;
99
// Fine.
1010
type Assoc2 where u32: Copy, i32: Copy;
11+
//
12+
type Assoc3;
1113
}
1214

1315
impl Trait for u32 {
@@ -17,6 +19,8 @@ impl Trait for u32 {
1719
// Not fine, suggests moving `u32: Copy`
1820
type Assoc2 = () where i32: Copy, u32: Copy;
1921
//~^ WARNING where clause not allowed here
22+
type Assoc3 = ();
23+
//~^ WARNING where clause not allowed here
2024
}
2125

2226
impl Trait for i32 {
@@ -25,6 +29,8 @@ impl Trait for i32 {
2529
// Not fine, suggests moving both.
2630
type Assoc2 = () where u32: Copy, i32: Copy;
2731
//~^ WARNING where clause not allowed here
32+
type Assoc3 = () where;
33+
//~^ WARNING where clause not allowed here
2834
}
2935

3036
fn main() {}

‎tests/ui/where-clauses/where-clause-placement-assoc-type-in-impl.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ trait Trait {
88
type Assoc where u32: Copy;
99
// Fine.
1010
type Assoc2 where u32: Copy, i32: Copy;
11+
//
12+
type Assoc3;
1113
}
1214

1315
impl Trait for u32 {
@@ -17,6 +19,8 @@ impl Trait for u32 {
1719
// Not fine, suggests moving `u32: Copy`
1820
type Assoc2 where u32: Copy = () where i32: Copy;
1921
//~^ WARNING where clause not allowed here
22+
type Assoc3 where = ();
23+
//~^ WARNING where clause not allowed here
2024
}
2125

2226
impl Trait for i32 {
@@ -25,6 +29,8 @@ impl Trait for i32 {
2529
// Not fine, suggests moving both.
2630
type Assoc2 where u32: Copy, i32: Copy = ();
2731
//~^ WARNING where clause not allowed here
32+
type Assoc3 where = () where;
33+
//~^ WARNING where clause not allowed here
2834
}
2935

3036
fn main() {}

0 commit comments

Comments
 (0)