Some initial normalization method changes #104905

compiler-errors · 2022-11-25T18:24:35Z

Rename AtExt::normalize to QueryNormalizeExt::query_normalize (using the QueryNormalizer)
Introduce NormalizeExt::normalize to replace partially_normalize_associated_types_in (using the AssocTypeNormalizer)
Rename FnCtxt::normalize_associated_types_in to FnCtxt::normalize
Remove some unused other normalization fns in Inherited and FnCtxt

Also includes one drive-by where we're no longer creating a FnCtxt inside of check_fn, but passing it in. This means we don't need such weird FnCtxt construction logic.

Stacked on top of #104835 for convenience.

r? types

rustbot · 2022-11-25T18:24:42Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

compiler-errors · 2022-11-25T18:32:25Z

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

        debug!(
            "instantiate_bounds(bounds={:?}, substs={:?}) = {:?}, {:?}",
            bounds, substs, result, spans,
        );
        (result, spans)
    }

-    pub(in super::super) fn normalize_associated_types_in<T>(&self, span: Span, value: T) -> T
+    pub(in super::super) fn normalize<T>(&self, span: Span, value: T) -> T


This intentionally takes a span instead of an ObligationCause because all of FnCtxt::normalize callers would be creating misc causes.

compiler-errors · 2022-11-25T20:29:26Z

compiler/rustc_hir_typeck/src/lib.rs

-                param_env,
-                fn_sig,
-            );
+            // FIXME(compiler-errors): Remove


Should have been fixed in the next commit

spastorino · 2022-11-25T20:31:33Z

Looks good to me, as soon as #104835 lands r=me

compiler-errors · 2022-11-25T23:32:11Z

@bors r=spastorino

bors · 2022-11-25T23:32:13Z

📌 Commit ba76acdd38645f7fc29a602436cfcdff4a13a840 has been approved by spastorino

It is now in the queue for this repository.

bors · 2022-11-26T15:47:46Z

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

compiler-errors · 2022-11-26T17:49:59Z

@bors r=spastorino

bors · 2022-11-26T17:50:01Z

📌 Commit c5e677eb2c182b87ed8d7d9788d1f7f71d7dcc0e has been approved by spastorino

It is now in the queue for this repository.

bors · 2022-11-28T17:22:15Z

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

rustbot · 2022-11-28T17:36:00Z

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

cc @lcnr

compiler-errors · 2022-11-28T19:57:00Z

Trivial rebase

@bors r=spastorino

bors · 2022-11-28T19:57:01Z

📌 Commit 1e236ac has been approved by spastorino

It is now in the queue for this repository.

lcnr

general notes:

we should probably remove struct Normalized and always use InferOk
we have to add/update the comments for the normalization routines
remove normalize_to and normalize in favor of normalize_with_depth_to and normalize_with_depth

apart from that r=me

thanks ❤️

compiler-errors · 2022-11-29T16:42:55Z

Alright, I'll do that in a follow-up PR ✨

bors · 2022-11-30T11:13:12Z

⌛ Testing commit 1e236ac with merge 24606de...

bors · 2022-11-30T14:02:56Z

☀️ Test successful - checks-actions
Approved by: spastorino
Pushing 24606de to master...

rust-timer · 2022-11-30T15:22:19Z

Finished benchmarking commit (24606de): 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.9%	[-1.0%, -0.8%]	2
Improvements ✅ (secondary)	-2.2%	[-2.8%, -0.3%]	7
All ❌✅ (primary)	-0.9%	[-1.0%, -0.8%]	2

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)	2.0%	[2.0%, 2.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.0%	[-2.0%, -2.0%]	1
All ❌✅ (primary)	2.0%	[2.0%, 2.0%]	1

Cycles

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

…s, r=spastorino Some initial normalization method changes 1. Rename `AtExt::normalize` to `QueryNormalizeExt::query_normalize` (using the `QueryNormalizer`) 2. Introduce `NormalizeExt::normalize` to replace `partially_normalize_associated_types_in` (using the `AssocTypeNormalizer`) 3. Rename `FnCtxt::normalize_associated_types_in` to `FnCtxt::normalize` 4. Remove some unused other normalization fns in `Inherited` and `FnCtxt` Also includes one drive-by where we're no longer creating a `FnCtxt` inside of `check_fn`, but passing it in. This means we don't need such weird `FnCtxt` construction logic. Stacked on top of rust-lang#104835 for convenience. r? types

rustbot assigned spastorino Nov 25, 2022

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 25, 2022

compiler-errors mentioned this pull request Nov 25, 2022

Use ocx.normalize in report_projection_error #104903

Merged

compiler-errors commented Nov 25, 2022

View reviewed changes

This comment has been minimized.

# to view

compiler-errors commented Nov 25, 2022

View reviewed changes

compiler-errors force-pushed the normalization-changes branch from d790e59 to ba76acd Compare November 25, 2022 23:02

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 Nov 25, 2022

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 Nov 26, 2022

compiler-errors force-pushed the normalization-changes branch from ba76acd to c5e677e Compare November 26, 2022 17:49

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 26, 2022

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 Nov 28, 2022

compiler-errors added 4 commits November 28, 2022 17:32

Rename At::normalize to At::query_normalize

f12e772

partially_normalize_... -> At::normalize

fc71083

FnCtxt normalization stuff

52cd342

Simplify more FnCtxt normalization

0678622

compiler-errors added 2 commits November 28, 2022 17:35

Make normalize and normalize_to pub(crate)

ce409b5

Make ObligationCtxt::normalize take cause by borrow

1e236ac

compiler-errors force-pushed the normalization-changes branch from c5e677e to 1e236ac Compare November 28, 2022 17:35

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 28, 2022

lcnr reviewed Nov 29, 2022

View reviewed changes

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 30, 2022

bors merged commit 24606de into rust-lang:master Nov 30, 2022

rustbot added this to the 1.67.0 milestone Nov 30, 2022

bors mentioned this pull request Nov 30, 2022

Address some EarlyBinder nits #103600

Merged

compiler-errors deleted the normalization-changes branch August 11, 2023 20:11

Some initial normalization method changes #104905

Some initial normalization method changes #104905

Uh oh!

Conversation

compiler-errors commented Nov 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Nov 25, 2022

Uh oh!

compiler-errors Nov 25, 2022

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

compiler-errors Nov 25, 2022

Choose a reason for hiding this comment

Uh oh!

spastorino commented Nov 25, 2022

Uh oh!

compiler-errors commented Nov 25, 2022

Uh oh!

bors commented Nov 25, 2022

Uh oh!

bors commented Nov 26, 2022

Uh oh!

compiler-errors commented Nov 26, 2022

Uh oh!

bors commented Nov 26, 2022

Uh oh!

bors commented Nov 28, 2022

Uh oh!

rustbot commented Nov 28, 2022

Uh oh!

compiler-errors commented Nov 28, 2022

Uh oh!

bors commented Nov 28, 2022

Uh oh!

lcnr left a comment • edited by compiler-errors Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Nov 29, 2022

Uh oh!

bors commented Nov 30, 2022

Uh oh!

bors commented Nov 30, 2022

Uh oh!

rust-timer commented Nov 30, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Uh oh!

compiler-errors commented Nov 25, 2022 •

edited

Loading

lcnr left a comment •

edited by compiler-errors

Loading