Remove type-traversal trait aliases #108340

eggyal · 2023-02-22T10:47:00Z

#107924 moved the type traversal (folding and visiting) traits into the type library, but created trait aliases in rustc_middle to minimise both the API churn for trait consumers and the arising boilerplate. As mentioned in that PR, an alternative approach of defining subtraits with blanket implementations of the respective supertraits was also considered at that time but was ruled out as not adding much value.

Unfortunately, it has since emerged that rust-analyzer has difficulty with these trait aliases at present, resulting in a degraded contributor experience (see the recent r-a has become useless topic on the #t-compiler/help Zulip stream).

This PR removes the trait aliases, and accordingly the underlying type library traits are now used directly; they are parameterised by TyCtxt<'tcx> rather than just the 'tcx lifetime, and imports have been updated to reflect the fact that the trait aliases' explicitly named traits are no longer automatically brought into scope. These changes also roll-back the (no-longer required) workarounds to #107747 that were made in b409329.

Since this PR is just a find+replace together with the changes necessary for compilation & tidy to pass, it's currently just one mega-commit. Let me know if you'd like it broken up.

r? @oli-obk

rustbot · 2023-02-22T10:47:10Z

Some changes occured in rustc_ty_utils::consts.rs

cc @BoxyUwU

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

Some changes occured in abstract_const.rs

cc @BoxyUwU

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

oli-obk · 2023-02-22T10:56:46Z

@bors r+ p=1 bitrotty

bors · 2023-02-22T10:56:48Z

📌 Commit 486ac798f4c168050ff3537d9f4aa9786885a485 has been approved by oli-obk

It is now in the queue for this repository.

eggyal · 2023-02-22T11:07:36Z

Oops, forgot about that annoying test.

oli-obk · 2023-02-22T11:32:32Z

@bors r+ p=1 bitrotty

bors · 2023-02-22T11:32:34Z

📌 Commit 6360067bbd48b360d496d4a74ece33a1a164de34 has been approved by oli-obk

It is now in the queue for this repository.

oli-obk · 2023-02-22T11:33:43Z

Oops, forgot about that annoying test.

oof. We could add an stderr normalization to the test that removes the line information from the output

eggyal · 2023-02-22T12:14:23Z

Good thinking! Done.

oli-obk · 2023-02-22T12:46:21Z

@bors r+ p=1 bitrotty

bors · 2023-02-22T12:46:23Z

📌 Commit 0bf016de5dda192f2d6bdc1d6c0778c26a01ebb5 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2023-02-22T16:08:26Z

☔ The latest upstream changes (presumably #108339) made this pull request unmergeable. Please resolve the merge conflicts.

eggyal · 2023-02-22T17:05:41Z

Rebased.

@rustbot ready

compiler-errors · 2023-02-22T17:18:45Z

@bors r=oli-obk

bors · 2023-02-22T17:18:47Z

📌 Commit a9b2354 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2023-02-22T18:26:56Z

⌛ Testing commit a9b2354 with merge fdbc432...

bors · 2023-02-22T21:24:22Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing fdbc432 to master...

rust-timer · 2023-02-23T07:29:25Z

Finished benchmarking commit (fdbc432): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.4%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.3%	[1.3%, 1.3%]	1
Regressions ❌ (secondary)	3.3%	[2.4%, 5.0%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.0%, -3.0%]	1
All ❌✅ (primary)	1.3%	[1.3%, 1.3%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.8%	[-5.4%, -4.4%]	6
All ❌✅ (primary)	-	-	0

…s, r=oli-obk Remove type-traversal trait aliases rust-lang#107924 moved the type traversal (folding and visiting) traits into the type library, but created trait aliases in `rustc_middle` to minimise both the API churn for trait consumers and the arising boilerplate. As mentioned in that PR, an alternative approach of defining subtraits with blanket implementations of the respective supertraits was also considered at that time but was ruled out as not adding much value. Unfortunately, it has since emerged that rust-analyzer has difficulty with these trait aliases at present, resulting in a degraded contributor experience (see the recent [r-a has become useless](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/r-a.20has.20become.20useless) topic on the #t-compiler/help Zulip stream). This PR removes the trait aliases, and accordingly the underlying type library traits are now used directly; they are parameterised by `TyCtxt<'tcx>` rather than just the `'tcx` lifetime, and imports have been updated to reflect the fact that the trait aliases' explicitly named traits are no longer automatically brought into scope. These changes also roll-back the (no-longer required) workarounds to rust-lang#107747 that were made in b409329. Since this PR is just a find+replace together with the changes necessary for compilation & tidy to pass, it's currently just one mega-commit. Let me know if you'd like it broken up. r? `@oli-obk`

Update the toolchain to use nightly-2023-04-16. Changes were related to the following changes to the toolchain: - rust-lang/rust#108944 - rust-lang/rust#108148 - rust-lang/rust#108471 - rust-lang/rust#109358 - rust-lang/rust#109849 - rust-lang/rust#109819 - rust-lang/rust#109718 - rust-lang/rust#109092 - rust-lang/rust#108856 - rust-lang/rust#105613 - rust-lang/rust#103042 - rust-lang/rust#109716 - rust-lang/rust#108340 - rust-lang/rust#102906 - rust-lang/rust#98112 - rust-lang/rust#108080

…s, r=oli-obk Remove type-traversal trait aliases rust-lang#107924 moved the type traversal (folding and visiting) traits into the type library, but created trait aliases in `rustc_middle` to minimise both the API churn for trait consumers and the arising boilerplate. As mentioned in that PR, an alternative approach of defining subtraits with blanket implementations of the respective supertraits was also considered at that time but was ruled out as not adding much value. Unfortunately, it has since emerged that rust-analyzer has difficulty with these trait aliases at present, resulting in a degraded contributor experience (see the recent [r-a has become useless](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/r-a.20has.20become.20useless) topic on the #t-compiler/help Zulip stream). This PR removes the trait aliases, and accordingly the underlying type library traits are now used directly; they are parameterised by `TyCtxt<'tcx>` rather than just the `'tcx` lifetime, and imports have been updated to reflect the fact that the trait aliases' explicitly named traits are no longer automatically brought into scope. These changes also roll-back the (no-longer required) workarounds to rust-lang#107747 that were made in b409329. Since this PR is just a find+replace together with the changes necessary for compilation & tidy to pass, it's currently just one mega-commit. Let me know if you'd like it broken up. r? `@oli-obk`

rustbot assigned oli-obk Feb 22, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2023

eggyal force-pushed the remove_traversal_trait_aliases branch from 486ac79 to 6360067 Compare February 22, 2023 11:07

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 22, 2023

eggyal added 2 commits February 22, 2023 17:04

Remove type-traversal trait aliases

695072d

Normalize line+col in normalize-tait-in-const test

a9b2354

eggyal force-pushed the remove_traversal_trait_aliases branch from 0bf016d to a9b2354 Compare February 22, 2023 17:05

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 22, 2023

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 22, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 22, 2023

bors merged commit fdbc432 into rust-lang:master Feb 22, 2023

rustbot added this to the 1.69.0 milestone Feb 22, 2023

xFrednet mentioned this pull request Feb 22, 2023

Bump rust nightly -> 2023-03-09 rust-marker/marker#101

Closed

eggyal deleted the remove_traversal_trait_aliases branch February 22, 2023 21:38

lcnr removed the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Mar 6, 2023

celinval mentioned this pull request Apr 26, 2023

Upgrade the toolchain to nightly-2023-04-16 model-checking/kani#2406

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove type-traversal trait aliases #108340

Remove type-traversal trait aliases #108340

eggyal commented Feb 22, 2023 •

edited

Loading

rustbot commented Feb 22, 2023

oli-obk commented Feb 22, 2023

bors commented Feb 22, 2023

eggyal commented Feb 22, 2023

oli-obk commented Feb 22, 2023

bors commented Feb 22, 2023

oli-obk commented Feb 22, 2023

eggyal commented Feb 22, 2023

oli-obk commented Feb 22, 2023

bors commented Feb 22, 2023

bors commented Feb 22, 2023

eggyal commented Feb 22, 2023

compiler-errors commented Feb 22, 2023

bors commented Feb 22, 2023

bors commented Feb 22, 2023

bors commented Feb 22, 2023

rust-timer commented Feb 23, 2023

Remove type-traversal trait aliases #108340

Remove type-traversal trait aliases #108340

Conversation

eggyal commented Feb 22, 2023 • edited Loading

rustbot commented Feb 22, 2023

oli-obk commented Feb 22, 2023

bors commented Feb 22, 2023

eggyal commented Feb 22, 2023

oli-obk commented Feb 22, 2023

bors commented Feb 22, 2023

oli-obk commented Feb 22, 2023

eggyal commented Feb 22, 2023

oli-obk commented Feb 22, 2023

bors commented Feb 22, 2023

bors commented Feb 22, 2023

eggyal commented Feb 22, 2023

compiler-errors commented Feb 22, 2023

bors commented Feb 22, 2023

bors commented Feb 22, 2023

bors commented Feb 22, 2023

rust-timer commented Feb 23, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

eggyal commented Feb 22, 2023 •

edited

Loading