Switch to `EarlyBinder` for `const_param_default` and `impl_trait_ref` queries #106696

kylematsuda · 2023-01-10T22:22:46Z

Part of the work to close #105779 and implement rust-lang/types-team#78.

Several queries X have a bound_X variant that wraps the output in EarlyBinder. This PR adds EarlyBinder to the return type of const_param_default and impl_trait_ref, and removes their bound_X variants.

r? @lcnr

rustbot · 2023-01-10T22:22:54Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @lcnr (or someone else) soon.

Please see the contribution instructions for more information.

jackh726 · 2023-01-10T23:08:25Z

We can do this in parts, doesn't have to be a single PR.

compiler/rustc_hir_analysis/src/astconv/mod.rs

compiler/rustc_hir_analysis/src/check/check.rs

compiler/rustc_hir_analysis/src/check/wfcheck.rs

compiler/rustc_hir_analysis/src/coherence/orphan.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs

compiler/rustc_ty_utils/src/implied_bounds.rs

src/librustdoc/passes/collect_intra_doc_links.rs

lcnr · 2023-01-11T10:49:12Z

But yeah, as said by @jackh726, the change is big enough that doing it for each query (or a few small ones together) separately in different PRs is probably a better idea to both make reviews easier and to prevent merge conflicts.

kylematsuda · 2023-01-11T16:25:04Z

@jackh726 and @lcnr: Thanks, that sounds good. I updated the title and description to reduce the scope of this PR to just the two queries that are already included here.

@lcnr, thanks for the review and the detailed explanations! Tbh I'm not surprised that I got a lot of them wrong, hopefully after studying your explanations I will do slightly better on the next batch 😬

bors · 2023-01-11T19:58:50Z

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

rustbot · 2023-01-11T20:52:34Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the core trait solver

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

compiler/rustc_metadata/src/rmeta/encoder.rs

compiler/rustc_ty_utils/src/ty.rs

lcnr · 2023-01-12T08:19:50Z

@bors r+ rollup=iffy

bors · 2023-01-12T08:19:52Z

📌 Commit 6725380aa2a80d1d1ba533995d699cf2ba8c31d0 has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-01-12T14:00:33Z

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

bors · 2023-01-12T22:59:12Z

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

lcnr · 2023-01-13T09:17:06Z

@bors r+ rollup

bors · 2023-01-13T09:17:08Z

📌 Commit e0b70c806d4e467cf2891f75e19072ab22d6fc0b has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-01-13T13:58:16Z

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

…r rustc_metadata) and Value for EarlyBinder

…const_param_default query; add EarlyBinder to const_param_default in metadata

…trait_ref query; add EarlyBinder to impl_trait_ref in metadata

jackh726 · 2023-01-14T14:44:44Z

@bors r=lcnr rollup=never p=1

Bitrotty

bors · 2023-01-14T14:44:46Z

📌 Commit 6e969ea has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-01-14T17:44:33Z

⌛ Testing commit 6e969ea with merge b8f9cb3...

bors · 2023-01-14T20:53:30Z

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

rust-timer · 2023-01-14T22:12:25Z

Finished benchmarking commit (b8f9cb3): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.2%	[0.2%, 0.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.3%	[-0.4%, -0.2%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.4%, 0.2%]	4

Max RSS (memory usage)

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

Cycles

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

pnkfelix · 2023-01-18T19:25:06Z

there is one small regression to bitmaps-full doc, and three improvements to bitmaps-incr-full {check, debug, opt}.

If its not noise, its seems like the right trade off.

Marking as triaged.

@rustbot label: perf-regression-triaged

…r=compiler-errors Small cleanups around `EarlyBinder` Cleaning up a few things that were brought up by `@lcnr` in reviewing rust-lang#106696: - [make `issue33140_self_ty` query return `Option<EarlyBinder<Ty>>`](rust-lang#106696 (comment)) - [small style improvement](rust-lang#106696 (comment))

rustbot assigned lcnr Jan 10, 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 10, 2023

lcnr reviewed Jan 11, 2023

View reviewed changes

kylematsuda changed the title ~~[WIP] Switch to EarlyBinder as default~~ Switch to EarlyBinder for const_param_default and impl_trait_ref queries Jan 11, 2023

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jan 11, 2023

kylematsuda force-pushed the early-binder branch from 777ebf1 to 6725380 Compare January 11, 2023 20:09

kylematsuda marked this pull request as ready for review January 11, 2023 20:52

lcnr reviewed Jan 12, 2023

View reviewed changes

compiler/rustc_metadata/src/rmeta/encoder.rs Show resolved Hide resolved

compiler/rustc_ty_utils/src/ty.rs Show resolved Hide resolved

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 Jan 12, 2023

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 Jan 12, 2023

kylematsuda force-pushed the early-binder branch from 6725380 to 26dbf35 Compare January 12, 2023 17:13

kylematsuda force-pushed the early-binder branch from 26dbf35 to e0b70c8 Compare January 13, 2023 07:19

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 Jan 13, 2023

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 Jan 13, 2023

matthiaskrgr mentioned this pull request Jan 13, 2023

Rollup of 5 pull requests #106809

Closed

kylematsuda added 6 commits January 14, 2023 00:13

add EarlyBinder::subst_identity; impl ParameterizedOverTcx (needed fo…

c84917a

…r rustc_metadata) and Value for EarlyBinder

change usages of const_param_default query to bound_const_param_default

bd6c635

change const_param_default query to return EarlyBinder; remove bound_…

ef58baf

…const_param_default query; add EarlyBinder to const_param_default in metadata

change usages of impl_trait_ref to bound_impl_trait_ref

be130b5

change impl_trait_ref query to return EarlyBinder; remove bound_impl_…

f29a334

…trait_ref query; add EarlyBinder to impl_trait_ref in metadata

fix various subst_identity vs skip_binder

6e969ea

kylematsuda force-pushed the early-binder branch from e0b70c8 to 6e969ea Compare January 14, 2023 07:30

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 Jan 14, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 14, 2023

bors merged commit b8f9cb3 into rust-lang:master Jan 14, 2023

rustbot added this to the 1.68.0 milestone Jan 14, 2023

bors mentioned this pull request Jan 14, 2023

Rework some predicates_of/{Generic,Instantiated}Predicates code #106395

Merged

rustbot added the perf-regression Performance regression. label Jan 14, 2023

lcnr mentioned this pull request Jan 16, 2023

switch to EarlyBinder as default #105779

Closed

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jan 18, 2023

kylematsuda mentioned this pull request Feb 16, 2023

Small cleanups around EarlyBinder #108133

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to `EarlyBinder` for `const_param_default` and `impl_trait_ref` queries #106696

Switch to `EarlyBinder` for `const_param_default` and `impl_trait_ref` queries #106696

kylematsuda commented Jan 10, 2023 •

edited

Loading

rustbot commented Jan 10, 2023

jackh726 commented Jan 10, 2023

lcnr commented Jan 11, 2023 •

edited

Loading

kylematsuda commented Jan 11, 2023

bors commented Jan 11, 2023

rustbot commented Jan 11, 2023

lcnr commented Jan 12, 2023

bors commented Jan 12, 2023

bors commented Jan 12, 2023

bors commented Jan 12, 2023

lcnr commented Jan 13, 2023

bors commented Jan 13, 2023

bors commented Jan 13, 2023

jackh726 commented Jan 14, 2023

bors commented Jan 14, 2023

bors commented Jan 14, 2023

bors commented Jan 14, 2023

rust-timer commented Jan 14, 2023

pnkfelix commented Jan 18, 2023

Switch to EarlyBinder for const_param_default and impl_trait_ref queries #106696

Switch to EarlyBinder for const_param_default and impl_trait_ref queries #106696

Conversation

kylematsuda commented Jan 10, 2023 • edited Loading

rustbot commented Jan 10, 2023

jackh726 commented Jan 10, 2023

lcnr commented Jan 11, 2023 • edited Loading

kylematsuda commented Jan 11, 2023

bors commented Jan 11, 2023

rustbot commented Jan 11, 2023

lcnr commented Jan 12, 2023

bors commented Jan 12, 2023

bors commented Jan 12, 2023

bors commented Jan 12, 2023

lcnr commented Jan 13, 2023

bors commented Jan 13, 2023

bors commented Jan 13, 2023

jackh726 commented Jan 14, 2023

bors commented Jan 14, 2023

bors commented Jan 14, 2023

bors commented Jan 14, 2023

rust-timer commented Jan 14, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

pnkfelix commented Jan 18, 2023

Switch to `EarlyBinder` for `const_param_default` and `impl_trait_ref` queries #106696

Switch to `EarlyBinder` for `const_param_default` and `impl_trait_ref` queries #106696

kylematsuda commented Jan 10, 2023 •

edited

Loading

lcnr commented Jan 11, 2023 •

edited

Loading