Replace `tcx.mk_trait_ref` with `TraitRef::new` #110806

WaffleLapkin · 2023-04-25T16:14:57Z

First step in implementing rust-lang/compiler-team#616
r? @lcnr

In rust `new`-ish functions are usually the first ones in an `impl` block

rustbot · 2023-04-25T16:15:06Z

Some changes occurred to the core trait solver

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

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

cc @lcnr, @compiler-errors

compiler/rustc_hir_analysis/src/bounds.rs

rustbot · 2023-04-25T16:45:30Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Noratrieb · 2023-04-25T16:45:47Z

compiler/rustc_trait_selection/src/solve/trait_goals.rs

-            ty::Binder::dummy(
-                tcx.mk_trait_ref(goal.predicate.def_id(), [self_ty, generator.resume_ty()]),
-            )
+            ty::Binder::dummy(ty::TraitRef::new(


ty::TraitRef::new starts getting pretty verbose, maybe we should start with some use ty::TraitRef;? unsure about the types opinion on that

I don't have an opinion here and expect the same for most (if not all) types members 😁 afaik we tend to already not have a consistent approach to which parts of ty to import

lcnr

some nits and further cleanup ideas

feel free to implement whichever ones you want

after that r=me

compiler/rustc_borrowck/src/type_check/mod.rs

compiler/rustc_hir_typeck/src/coercion.rs

compiler/rustc_middle/src/ty/sty.rs

compiler/rustc_trait_selection/src/traits/project.rs

…stead}`

lcnr · 2023-04-25T19:17:40Z

please relabel once this is ready for the final review + merge 😁

@rustbot author

lcnr · 2023-04-25T19:17:54Z

(or just r+ it yourself 😁 )

…t` and a `Span`

…::Binber::dummy` calls

WaffleLapkin · 2023-04-26T12:05:49Z

I've substantially changed everything with the review suggestions, so @rustbot ready

WaffleLapkin · 2023-04-26T12:23:08Z

One day I'll stop forgetting to fix {rustdoc, clippy, miri} after my compiler changes... One day... But not today it seems

jackh726 · 2023-04-26T13:24:36Z

Please don't land, see comment.

jackh726 · 2023-04-26T13:28:08Z

compiler/rustc_middle/src/ty/mod.rs

@@ -1207,6 +1207,18 @@ impl<'tcx> ToPredicate<'tcx, PolyTraitPredicate<'tcx>> for Binder<'tcx, TraitRef
    }
 }

+impl<'tcx> ToPredicate<'tcx, PolyTraitPredicate<'tcx>> for TraitRef<'tcx> {
+    fn to_predicate(self, tcx: TyCtxt<'tcx>) -> PolyTraitPredicate<'tcx> {
+        ty::Binder::dummy(self).to_predicate(tcx)


Nope, this is not a change we should merge (or the impl below).

In fact, I would be in favor of some explicit negative impl here just so we can slap a big comment on this so nobody tries to make the positive impl again.

Can you explain what is wrong in this impl?

Ah, I see: #110806 (comment)

lcnr · 2023-05-03T20:21:51Z

@bors r+ rollup=iffy

bors · 2023-05-03T20:21:53Z

📌 Commit 689721d has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-05-04T05:54:13Z

⌛ Testing commit 689721d with merge 6f8c055...

bors · 2023-05-04T08:52:49Z

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 6f8c055 to master...

rust-timer · 2023-05-04T10:39:42Z

Finished benchmarking commit (6f8c055): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

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.2%	[1.0%, 1.3%]	2
Regressions ❌ (secondary)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-2.4%	[-2.4%, -2.4%]	1
Improvements ✅ (secondary)	-1.3%	[-2.2%, -1.0%]	5
All ❌✅ (primary)	-0.0%	[-2.4%, 1.3%]	3

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)	-11.3%	[-14.2%, -8.5%]	6
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 656.223s -> 655.069s (-0.18%)

Replace `tcx.mk_trait_ref` with `TraitRef::new` First step in implementing rust-lang/compiler-team#616 r? `@lcnr`

WaffleLapkin added 4 commits April 25, 2023 15:34

Add ty::TraitRef::{new, from_lang_item}

14f8327

Move TraitRef constructors to the top

2d8c905

In rust `new`-ish functions are usually the first ones in an `impl` block

Replace tcx.mk_trait_ref with ty::TraitRef::new

46b01ab

Remove tcx.mk_trait_ref

8f7fe4a

rustbot assigned lcnr Apr 25, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels Apr 25, 2023

WaffleLapkin commented Apr 25, 2023

View reviewed changes

compiler/rustc_hir_analysis/src/bounds.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

WaffleLapkin added 2 commits April 25, 2023 16:31

Use ty::TraitRef::new in rustdoc

f0dd95c

Use ty::TraitRef::new in clippy

91d495f

Noratrieb reviewed Apr 25, 2023

View reviewed changes

Remove some useless ty::Binder::dummy calls

c727edc

rust-cloud-vms bot force-pushed the unmkI branch from d4e2cf7 to c727edc Compare April 25, 2023 16:47

This comment has been minimized.

Sign in to view

lcnr reviewed Apr 25, 2023

View reviewed changes

Rename `TraitRef::{_use_mk_trait_ref_instead => _use_trait_ref_new_in…

d9f842a

…stead}`

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2023

WaffleLapkin added 4 commits April 26, 2023 10:38

Remove some more useless ty::Binder::dummy calls

071f737

Switch ty::TraitRef::from_lang_item from using TyCtxtAt to `TyCtx…

4f2532f

…t` and a `Span`

Add new ToPredicate impls and TraitRef methods to remove some `ty…

1b8c778

…::Binber::dummy` calls

Don't return a Binder from TraitRef::identity

39b95c9

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 26, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 26, 2023

This comment has been minimized.

Sign in to view

jackh726 reviewed Apr 26, 2023

View reviewed changes

Fix uses of TraitRef::identity in clippy and rustdoc

689721d

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 May 3, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label May 4, 2023

bors merged commit 6f8c055 into rust-lang:master May 4, 2023

rustbot added this to the 1.71.0 milestone May 4, 2023

This was referenced May 4, 2023

Introduce AliasKind::Inherent for inherent associated types #109410

Merged

Deal with unnormalized projections when structurally resolving types with new solver #110204

Merged

flip1995 pushed a commit to flip1995/rust that referenced this pull request May 5, 2023

Auto merge of rust-lang#110806 - WaffleLapkin:unmkI, r=lcnr

8518391

Replace `tcx.mk_trait_ref` with `TraitRef::new` First step in implementing rust-lang/compiler-team#616 r? `@lcnr`

celinval mentioned this pull request Jun 21, 2023

Upgrade rust toolchain to nightly-2023-06-20 model-checking/kani#2551

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace `tcx.mk_trait_ref` with `TraitRef::new` #110806

Replace `tcx.mk_trait_ref` with `TraitRef::new` #110806

WaffleLapkin commented Apr 25, 2023

rustbot commented Apr 25, 2023

This comment has been minimized.

rustbot commented Apr 25, 2023

Noratrieb Apr 25, 2023

lcnr Apr 25, 2023

This comment has been minimized.

lcnr left a comment

lcnr commented Apr 25, 2023

lcnr commented Apr 25, 2023

WaffleLapkin commented Apr 26, 2023

This comment has been minimized.

WaffleLapkin commented Apr 26, 2023

jackh726 commented Apr 26, 2023

jackh726 Apr 26, 2023

WaffleLapkin Apr 26, 2023

WaffleLapkin Apr 26, 2023

lcnr commented May 3, 2023

bors commented May 3, 2023

bors commented May 4, 2023

bors commented May 4, 2023

rust-timer commented May 4, 2023

Replace tcx.mk_trait_ref with TraitRef::new #110806

Replace tcx.mk_trait_ref with TraitRef::new #110806

Conversation

WaffleLapkin commented Apr 25, 2023

rustbot commented Apr 25, 2023

This comment has been minimized.

rustbot commented Apr 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

lcnr left a comment

Choose a reason for hiding this comment

lcnr commented Apr 25, 2023

lcnr commented Apr 25, 2023

WaffleLapkin commented Apr 26, 2023

This comment has been minimized.

WaffleLapkin commented Apr 26, 2023

jackh726 commented Apr 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lcnr commented May 3, 2023

bors commented May 3, 2023

bors commented May 4, 2023

bors commented May 4, 2023

rust-timer commented May 4, 2023

Overall result: no relevant changes - no action needed

Replace `tcx.mk_trait_ref` with `TraitRef::new` #110806

Replace `tcx.mk_trait_ref` with `TraitRef::new` #110806