Skip to content

Rollup of 3 pull requests - #113293

Merged
bors merged 8 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-2395uw0
Jul 3, 2023
Merged

Rollup of 3 pull requests#113293
bors merged 8 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-2395uw0

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomezand others added 8 commits July 3, 2023 13:26
…, r=lcnr
Implement selection via new trait solver
Implements selection via the new solver by calling into `assemble_and_evaluate_candidates`, doing a very light-weight "winnow" to choose one candidate over the others, and then re-confirming that candidate outside of the `EvalCtxt` in order to compute the information necessary for the `ImplSource`.
This selection routine is best effort -- if it receives an ambiguous response from the `EvalCtxt`, then it may return ambiguity if the work to re-confirm the goal is not "easy" -- right now, that means everything except for object and impl goals. Since we don't want to reimplement all of the work of the `compute_builtin_*` methods in the solver internals, we bail out if we encounter ambiguity more often than the old solver. This should only barely affect [method selection](https://github.com/rust-lang/rust/blob/f798ada7babac06d4611b0b3a6079d8399ab58ab/compiler/rustc_hir_typeck/src/method/probe.rs#L1447) and not codegen. It can be made more precise later if needed.
r? `@lcnr`
…-cfg, r=notriddle
[rustdoc] Fix display of long inline cfg labels
Fixesrust-lang#87957.
Fixesrust-lang#112880.
Before:
![Screenshot from 2023-07-03 13-25-47](https://github.com/rust-lang/rust/assets/3050060/401e2c6b-2cfd-4ae3-9d15-b5e1dfec4201)
After:
![Screenshot from 2023-07-03 13-24-49](https://github.com/rust-lang/rust/assets/3050060/e42a34a8-bf60-409d-8a0c-1669d09e7e1e)
r? `@notriddle`
…led, r=compiler-errors
Don't perform selection if inherent associated types are not enabled
Fixesrust-lang#113265.
As discussed
r? `@compiler-errors`
@rustbotrustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jul 3, 2023
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=3

@bors

bors commented Jul 3, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 157bab6 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 Jul 3, 2023
@bors

bors commented Jul 3, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 157bab6 with merge 8931edf...

@bors

bors commented Jul 3, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 8931edf to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 3, 2023
@bors
bors merged commit 8931edf into rust-lang:masterJul 3, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jul 3, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#112869Implement selection via new trait solver528af93eb1caa20690fef5c72148c5d32793e9d0 (link)
#113285[rustdoc] Fix display of long inline cfg labelsc332b84e5551628b711de28282909eb49b2565c5 (link)
#113286Don't perform selection if inherent associated types are no…8a5c9db3b01c944a2e956bf366c41233bd0d104c (link)

previous master: 3ae0ef79fe

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (8931edf): comparison URL.

Overall result: ❌ regressions - 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.

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
2.2%[2.2%, 2.2%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.6%[-2.6%, -2.5%]2
All ❌✅ (primary)--0

Cycles

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

Binary size

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

Bootstrap: 670.578s -> 670.457s (-0.02%)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@GuillaumeGomez@bors@rust-timer@rustbot@fmease@compiler-errors