Retire ast::TyAliasWhereClauses.

[cjgillot]

ast::TyAliasWhereClauses is a tentative to avoid forgetting predicates when manipulating the AST.
It is incompatible with cfg attributes on where clauses.

This PR uses a regular WhereClause for the "second" clause.

Fixes #138010
cc #138037

[rustbot]

r? @jdonszelmann

rustbot has assigned @jdonszelmann.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[fmease]

Could you use the more minimal reproducers, #138010 (comment) and/or #138010 (comment) which are less obfuscated. Moreover, #138010 (comment) wouldn't require any extra unstable features.

[jackh726]

IIRC adding the purpose of adding this type was never to avoid allocating vecs, but rather to maintain the two separate Span locations and the predicates derived for them, and also unify the handling of the where clauses (with the idea that we may remove the ability to remove the before where clauses at some point, I also don't remember if there was some specific motivating reason for this or if it was just a general decision).

I'm a little surprised we don't regress any test outputs, but I guess all the info is still there, but now less well-defined.

I have mixed feelings here. I worry that this could lead to places checking the where clauses in generics but not in after_where_clauses, that was perhaps the motivating reason for this. Them being in the same place means that nobody can forget about them anywhere.

[rustbot]

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

[cjgillot]

IIRC adding the purpose of adding this type was never to avoid allocating vecs, but rather to maintain the two separate Span locations and the predicates derived for them, and also unify the handling of the where clauses (with the idea that we may remove the ability to remove the before where clauses at some point, I also don't remember if there was some specific motivating reason for this or if it was just a general decision).

I'm a little surprised we don't regress any test outputs, but I guess all the info is still there, but now less well-defined.

I'm not sure about the "less well-defined". In the current state, we have the information about the "before" span twice. Here we have everything once.

I have mixed feelings here. I worry that this could lead to places checking the where clauses in generics but not in after_where_clauses, that was perhaps the motivating reason for this. Them being in the same place means that nobody can forget about them anywhere.

This is mitigated by lowering. Most of the places where we manipulate predicates are on HIR, which does merge the lists. On the other hand, AST needs to be as close to the concrete syntax as possible for macro expansion.

[jackh726]

IIRC adding the purpose of adding this type was never to avoid allocating vecs, but rather to maintain the two separate Span locations and the predicates derived for them, and also unify the handling of the where clauses (with the idea that we may remove the ability to remove the before where clauses at some point, I also don't remember if there was some specific motivating reason for this or if it was just a general decision).
I'm a little surprised we don't regress any test outputs, but I guess all the info is still there, but now less well-defined.

I'm not sure about the "less well-defined". In the current state, we have the information about the "before" span twice. Here we have everything once.

Yes, "less well-defined" is perhaps not the right way to say this. What I mostly trying to say is that I could have imagined that it would have been easy (and could be easy in the future) to miss a case where we need to do something with both the where clauses in generics and after_where_clauses (whereas prior to this PR, it's not an "extra" thing you have to think about)

I have mixed feelings here. I worry that this could lead to places checking the where clauses in generics but not in after_where_clauses, that was perhaps the motivating reason for this. Them being in the same place means that nobody can forget about them anywhere.

This is mitigated by lowering. Most of the places where we manipulate predicates are on HIR, which does merge the lists. On the other hand, AST needs to be as close to the concrete syntax as possible for macro expansion.

Okay, good enough for me, I guess.

[rustbot]

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.