Yeet unnecessary param envs #119096

compiler-errors · 2023-12-18T21:25:16Z

We don't need to pass in param-envs around in the lexical region resolution code (or in MatchAgainstFreshVars in the solver), since it is only used to eval some consts in structurally_relate_tys which I removed.

This is in preparation for normalizing the outlives clauses in ParamEnv for the new trait solver.

r? lcnr

rustbot · 2023-12-18T21:25:26Z

Type relation code was changed

cc @compiler-errors, @lcnr

lcnr

do we want to move fn param_env into ObligationEmittingRelation to avoid needing these bug! impls?

afaict that's the only way param_env is used anymore. tbh I would maybe even rename TypeRelation to StructuralTypeRelation and ObligationEmittingRelation to simply be TypeRelation 🤔

compiler-errors · 2023-12-19T15:08:05Z

afaict that's the only way param_env is used anymore. tbh I would maybe even rename TypeRelation to StructuralTypeRelation and ObligationEmittingRelation to simply be TypeRelation 🤔

~~param_env is still used in structurally_relate_consts~~

edit: nvm

compiler-errors · 2023-12-19T15:09:56Z

I would maybe even rename TypeRelation to StructuralTypeRelation and ObligationEmittingRelation to simply be TypeRelation

I don't really like the names because StructuralTypeRelation is not really the accurate name when e.g. the fn tys just delegates to super_combine_tys. I think the naming right now is fine, but I will remove the param-env fns.

… structural relations

rustbot · 2023-12-19T17:13:36Z

Type relation code was changed

cc @compiler-errors, @lcnr

aliemjay

Nice!

lcnr · 2023-12-19T17:35:33Z

I would maybe even rename TypeRelation to StructuralTypeRelation and ObligationEmittingRelation to simply be TypeRelation

I don't really like the names because StructuralTypeRelation is not really the accurate name when e.g. the fn tys just delegates to super_combine_tys. I think the naming right now is fine, but I will remove the param-env fns.

I proposed to rename TypeRelation to StructuralTypeRelation. Anything that uses super_combine_tys has to impl ObligationEmittingRelation anyways, so it is not merely implementing StructuralTypeRelation

compiler-errors · 2023-12-19T17:40:12Z

Yes, I just think it's weird for a not-purely-structural-impl to implement a trait called "StructuralTypeRelation"

compiler-errors · 2023-12-19T17:42:31Z

I think the base trait in a lattice of capabilities (e.g. Iterator) should have the shortest name because it's not promising any capabilities. Additional traits qualify that (FusedIterator, DoubleEndedIterator) with additional capabilities in a way that's additive.

In this case Structural is not additive, but claiming something about types that only implement that trait.

lcnr · 2023-12-19T17:44:13Z

hmm, I guess for now lets just merge this. Will open a PR myself if I end up having a strong opinion here

@bors r+

bors · 2023-12-19T17:44:17Z

📌 Commit a75d002 has been approved by lcnr

It is now in the queue for this repository.

compiler-errors · 2023-12-19T17:46:38Z

like impl StructuralTypeRelation<'tcx> for Equate<'tcx> is misleading imo, because equate does not implement a structural type relation -- it implements a type relation, but that relation isn't structural 😅

…aram-envs, r=lcnr Yeet unnecessary param envs We don't need to pass in param-envs around in the lexical region resolution code (or in `MatchAgainstFreshVars` in the solver), since it is only used to eval some consts in `structurally_relate_tys` which I removed. This is in preparation for normalizing the outlives clauses in `ParamEnv` for the new trait solver. r? lcnr

…mpiler-errors Rollup of 7 pull requests Successful merges: - rust-lang#118691 (Add check for possible CStr literals in pre-2021) - rust-lang#118973 (rustc_codegen_ssa: Don't drop `IncorrectCguReuseType` , make `rustc_expected_cgu_reuse` attr work) - rust-lang#119071 (-Znext-solver: adapt overflow rules to avoid breakage) - rust-lang#119089 (effects: fix a comment) - rust-lang#119096 (Yeet unnecessary param envs) - rust-lang#119118 (Fix arm64e-apple-ios target) - rust-lang#119134 (resolve: Feed visibilities for unresolved trait impl items) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-12-20T05:15:47Z

⌛ Testing commit a75d002 with merge 5810dee...

bors · 2023-12-20T07:12:47Z

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 5810dee to master...

rust-timer · 2023-12-20T08:34:40Z

Finished benchmarking commit (5810dee): 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.8%	[-1.0%, -0.7%]	6
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)	0.9%	[0.5%, 1.5%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[-1.1%, 1.5%]	4

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.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-2.5%	[-3.0%, -1.9%]	6
All ❌✅ (primary)	-0.6%	[-0.6%, -0.6%]	1

Binary size

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

Bootstrap: 675.418s -> 670.994s (-0.66%)
Artifact size: 312.80 MiB -> 312.83 MiB (0.01%)

rustbot assigned lcnr Dec 18, 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. labels Dec 18, 2023

lcnr reviewed Dec 19, 2023

View reviewed changes

This comment was marked as duplicate.

# to view

compiler-errors added 3 commits December 19, 2023 15:10

Do not evaluate in structurally_relate_tys

e6d6b1d

Remove unnecessary param-env from lexical region resolution and fully…

009cd9c

… structural relations

Remove param env from relation altogether

a75d002

rust-cloud-vms bot force-pushed the yeet-unnecessary-param-envs branch from b0d8994 to a75d002 Compare December 19, 2023 17:13

aliemjay approved these changes Dec 19, 2023

View reviewed changes

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 Dec 19, 2023

compiler-errors mentioned this pull request Dec 19, 2023

Rollup of 5 pull requests #119142

Closed

compiler-errors mentioned this pull request Dec 19, 2023

Rollup of 7 pull requests #119143

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 20, 2023

bors merged commit 5810dee into rust-lang:master Dec 20, 2023

rustbot added this to the 1.76.0 milestone Dec 20, 2023

Yeet unnecessary param envs #119096

Yeet unnecessary param envs #119096

Uh oh!

Conversation

compiler-errors commented Dec 18, 2023

Uh oh!

rustbot commented Dec 18, 2023

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as duplicate.

compiler-errors commented Dec 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Dec 19, 2023

Uh oh!

rustbot commented Dec 19, 2023

Uh oh!

aliemjay left a comment

Choose a reason for hiding this comment

Uh oh!

lcnr commented Dec 19, 2023

Uh oh!

compiler-errors commented Dec 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Dec 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lcnr commented Dec 19, 2023

Uh oh!

bors commented Dec 19, 2023

Uh oh!

compiler-errors commented Dec 19, 2023

Uh oh!

bors commented Dec 20, 2023

Uh oh!

bors commented Dec 20, 2023

Uh oh!

rust-timer commented Dec 20, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

compiler-errors commented Dec 19, 2023 •

edited

Loading

compiler-errors commented Dec 19, 2023 •

edited

Loading

compiler-errors commented Dec 19, 2023 •

edited

Loading