Skip to content

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Oct 21, 2023

r? cuviper

cuviper and others added 12 commits October 20, 2023 17:45
(cherry picked from commit 20363f4)
(cherry picked from commit c4e61fa)
(cherry picked from commit 8f2af7e)
… more const trait things in libcore

(cherry picked from commit 16f8396)
Commit 8378487 from rust-lang#114611 changed the location of an obligation
deduplication step in `opt_normalize_projection_type`. This meant that
deduplication stopped happening on one path where it was still
necessary, causing a couple of drastic performance regressions.

This commit moves the deduplication back to the old location. The good
news is that rust-lang#114611 had four commits and 8378487 was of minimal
importance, so the perf benefits from that PR remain.

Fixes rust-lang#116780, rust-lang#116797.

(cherry picked from commit 91f2fbc)
(cherry picked from commit ab22470)
(cherry picked from commit bcdd3d7)
(cherry picked from commit a1e274f)
@rustbot
Copy link
Collaborator

rustbot commented Oct 21, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, 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 Oct 21, 2023
@cuviper
Copy link
Member Author

cuviper commented Oct 21, 2023

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Oct 21, 2023

📌 Commit eec25d6 has been approved by cuviper

It is now in the queue for this repository.

@bors 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 Oct 21, 2023
@bors
Copy link
Collaborator

bors commented Oct 21, 2023

⌛ Testing commit eec25d6 with merge 489647f...

@bors
Copy link
Collaborator

bors commented Oct 21, 2023

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 489647f to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2023
@bors bors merged commit 489647f into rust-lang:beta Oct 21, 2023
@rustbot rustbot added this to the 1.74.0 milestone Oct 21, 2023
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Oct 23, 2023
62: Automated pull from upstream `beta` r=pietroalbini a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#117005
* rust-lang/rust#116997



Co-authored-by: Weihang Lo <me@weihanglo.tw>
Co-authored-by: Josh Stone <jistone@redhat.com>
Co-authored-by: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: Nikita Popov <npopov@redhat.com>
Co-authored-by: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants