Skip to content

Commit 535c643

Browse files
estebankestebank
committed
Do not leave stray commas after applying suggestion
1 parent 0c1b273 commit 535c643

File tree

3 files changed

+160
-112
lines changed

3 files changed

+160
-112
lines changed

‎compiler/rustc_ast_passes/src/ast_validation.rs

+56-61
Original file line numberDiff line numberDiff line change
@@ -1593,6 +1593,58 @@ fn deny_equality_constraints(
15931593
}
15941594
}
15951595
}
1596+
1597+
let mut suggest =
1598+
|poly: &PolyTraitRef, potential_assoc: &PathSegment, predicate: &WhereEqPredicate| {
1599+
if let [trait_segment] = &poly.trait_ref.path.segments[..] {
1600+
let assoc = pprust::path_to_string(&ast::Path::from_ident(potential_assoc.ident));
1601+
let ty = pprust::ty_to_string(&predicate.rhs_ty);
1602+
let (args, span) = match &trait_segment.args {
1603+
Some(args) => match args.deref() {
1604+
ast::GenericArgs::AngleBracketed(args) => {
1605+
let Some(arg) = args.args.last() else {
1606+
return;
1607+
};
1608+
(format!(", {assoc} = {ty}"), arg.span().shrink_to_hi())
1609+
}
1610+
_ => return,
1611+
},
1612+
None => (format!("<{assoc} = {ty}>"), trait_segment.span().shrink_to_hi()),
1613+
};
1614+
let removal_span = if generics.where_clause.predicates.len() == 1 {
1615+
// We're removing th eonly where bound left, remove the whole thing.
1616+
generics.where_clause.span
1617+
} else {
1618+
let mut span = predicate.span;
1619+
let mut prev: Option<Span> = None;
1620+
let mut preds = generics.where_clause.predicates.iter().peekable();
1621+
// Find the predicate that shouldn't have been in the where bound list.
1622+
while let Some(pred) = preds.next() {
1623+
if let WherePredicate::EqPredicate(pred) = pred
1624+
&& pred.span == predicate.span
1625+
{
1626+
if let Some(next) = preds.peek() {
1627+
// This is the first predicate, remove the trailing comma as well.
1628+
span = span.with_hi(next.span().lo());
1629+
} else if let Some(prev) = prev {
1630+
// Remove the previous comma as well.
1631+
span = span.with_lo(prev.hi());
1632+
}
1633+
}
1634+
prev = Some(pred.span());
1635+
}
1636+
span
1637+
};
1638+
err.assoc2 = Some(errors::AssociatedSuggestion2 {
1639+
span,
1640+
args,
1641+
predicate: removal_span,
1642+
trait_segment: trait_segment.ident,
1643+
potential_assoc: potential_assoc.ident,
1644+
});
1645+
}
1646+
};
1647+
15961648
if let TyKind::Path(None, full_path) = &predicate.lhs_ty.kind {
15971649
// Given `A: Foo, Foo::Bar = RhsTy`, suggest `A: Foo<Bar = RhsTy>`.
15981650
for bounds in generics.params.iter().map(|p| &p.bounds).chain(
@@ -1608,37 +1660,9 @@ fn deny_equality_constraints(
16081660
.map(|segment| segment.ident.name)
16091661
.zip(poly.trait_ref.path.segments.iter().map(|segment| segment.ident.name))
16101662
.all(|(a, b)| a == b)
1663+
&& let Some(potential_assoc) = full_path.segments.iter().last()
16111664
{
1612-
let potential_assoc = full_path.segments.iter().last().unwrap();
1613-
// println!("asd");
1614-
if let [trait_segment] = &poly.trait_ref.path.segments[..] {
1615-
let assoc = pprust::path_to_string(&ast::Path::from_ident(
1616-
potential_assoc.ident,
1617-
));
1618-
let ty = pprust::ty_to_string(&predicate.rhs_ty);
1619-
let (args, span) = match &trait_segment.args {
1620-
Some(args) => match args.deref() {
1621-
ast::GenericArgs::AngleBracketed(args) => {
1622-
let Some(arg) = args.args.last() else {
1623-
continue;
1624-
};
1625-
(format!(", {assoc} = {ty}"), arg.span().shrink_to_hi())
1626-
}
1627-
_ => continue,
1628-
},
1629-
None => (
1630-
format!("<{assoc} = {ty}>"),
1631-
trait_segment.span().shrink_to_hi(),
1632-
),
1633-
};
1634-
err.assoc2 = Some(errors::AssociatedSuggestion2 {
1635-
span,
1636-
args,
1637-
predicate: predicate.span,
1638-
trait_segment: trait_segment.ident,
1639-
potential_assoc: potential_assoc.ident,
1640-
});
1641-
}
1665+
suggest(poly, potential_assoc, predicate);
16421666
}
16431667
}
16441668
}
@@ -1658,37 +1682,8 @@ fn deny_equality_constraints(
16581682
) {
16591683
if ident == potential_param.ident {
16601684
for bound in bounds {
1661-
if let ast::GenericBound::Trait(trait_ref, TraitBoundModifiers::NONE) =
1662-
bound
1663-
{
1664-
if let [trait_segment] = &trait_ref.trait_ref.path.segments[..] {
1665-
let assoc = pprust::path_to_string(&ast::Path::from_ident(
1666-
potential_assoc.ident,
1667-
));
1668-
let ty = pprust::ty_to_string(&predicate.rhs_ty);
1669-
let (args, span) = match &trait_segment.args {
1670-
Some(args) => match args.deref() {
1671-
ast::GenericArgs::AngleBracketed(args) => {
1672-
let Some(arg) = args.args.last() else {
1673-
continue;
1674-
};
1675-
(format!(", {assoc} = {ty}"), arg.span().shrink_to_hi())
1676-
}
1677-
_ => continue,
1678-
},
1679-
None => (
1680-
format!("<{assoc} = {ty}>"),
1681-
trait_segment.span().shrink_to_hi(),
1682-
),
1683-
};
1684-
err.assoc2 = Some(errors::AssociatedSuggestion2 {
1685-
span,
1686-
args,
1687-
predicate: predicate.span,
1688-
trait_segment: trait_segment.ident,
1689-
potential_assoc: potential_assoc.ident,
1690-
});
1691-
}
1685+
if let ast::GenericBound::Trait(poly, TraitBoundModifiers::NONE) = bound {
1686+
suggest(poly, potential_assoc, predicate);
16921687
}
16931688
}
16941689
}

‎tests/ui/generic-associated-types/equality-bound.rs

+25-14
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ use std::iter::FromIterator;
1717
struct X {}
1818

1919
impl FromIterator<bool> for X {
20-
fn from_iter<T>(_: T) -> Self
21-
where
22-
T: IntoIterator,
23-
IntoIterator::Item = A,
20+
fn from_iter<T>(_: T) -> Self where T: IntoIterator, IntoIterator::Item = A,
2421
//~^ ERROR equality constraints are not yet supported in `where` clauses
2522
//~| ERROR cannot find type `A` in this scope
2623
{
@@ -31,10 +28,7 @@ impl FromIterator<bool> for X {
3128
struct Y {}
3229

3330
impl FromIterator<bool> for Y {
34-
fn from_iter<T>(_: T) -> Self
35-
where
36-
T: IntoIterator,
37-
T::Item = A,
31+
fn from_iter<T>(_: T) -> Self where T: IntoIterator, T::Item = A,
3832
//~^ ERROR equality constraints are not yet supported in `where` clauses
3933
//~| ERROR cannot find type `A` in this scope
4034
{
@@ -45,9 +39,7 @@ impl FromIterator<bool> for Y {
4539
struct Z {}
4640

4741
impl FromIterator<bool> for Z {
48-
fn from_iter<T: IntoIterator>(_: T) -> Self
49-
where
50-
IntoIterator::Item = A,
42+
fn from_iter<T: IntoIterator>(_: T) -> Self where IntoIterator::Item = A,
5143
//~^ ERROR equality constraints are not yet supported in `where` clauses
5244
//~| ERROR cannot find type `A` in this scope
5345
{
@@ -58,14 +50,33 @@ impl FromIterator<bool> for Z {
5850
struct K {}
5951

6052
impl FromIterator<bool> for K {
61-
fn from_iter<T: IntoIterator>(_: T) -> Self
62-
where
63-
T::Item = A,
53+
fn from_iter<T: IntoIterator>(_: T) -> Self where T::Item = A,
6454
//~^ ERROR equality constraints are not yet supported in `where` clauses
6555
//~| ERROR cannot find type `A` in this scope
6656
{
6757
todo!()
6858
}
6959
}
7060

61+
struct L {}
62+
63+
impl FromIterator<bool> for L {
64+
fn from_iter<T>(_: T) -> Self where IntoIterator::Item = A, T: IntoIterator,
65+
//~^ ERROR equality constraints are not yet supported in `where` clauses
66+
//~| ERROR cannot find type `A` in this scope
67+
{
68+
todo!()
69+
}
70+
}
71+
72+
struct M {}
73+
74+
impl FromIterator<bool> for M {
75+
fn from_iter<T>(_: T) -> Self where T::Item = A, T: IntoIterator,
76+
//~^ ERROR equality constraints are not yet supported in `where` clauses
77+
//~| ERROR cannot find type `A` in this scope
78+
{
79+
todo!()
80+
}
81+
}
7182
fn main() {}

0 commit comments

Comments
 (0)