Skip to content

Automated pull from upstream beta#62

Merged
bors-ferrocene[bot] merged 17 commits intorelease/1.74from
automation/pull-upstream/bgcbzvjk
Oct 23, 2023
Merged

Automated pull from upstream beta#62
bors-ferrocene[bot] merged 17 commits intorelease/1.74from
automation/pull-upstream/bgcbzvjk

Conversation

@github-actions
Copy link
Contributor

This PR pulls the following changes from the upstream repository:

weihanglo and others added 17 commits October 20, 2023 18:20
(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 #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 #114611 had four commits and 8378487 was of minimal
importance, so the perf benefits from that PR remain.

Fixes #116780, #116797.

(cherry picked from commit 91f2fbc)
(cherry picked from commit ab22470)
(cherry picked from commit bcdd3d7)
(cherry picked from commit a1e274f)
[beta-1.74] Update cargo

1 commits in 22a976c6fb1bef45abcf182b4c7def87ad8b4a4d..ecb9851afd3095e988daaa35a48bc7f3cb748e04
2023-10-12 00:06:40 +0000 to 2023-10-18 20:42:16 +0000
- [beta-1.74.0] Partial-version spec support (rust-lang/cargo#12847)

r? ghost
[beta] backports and stage0 bump

- Bump stage0 to released stable compiler
- Hide host effect params from docs #116670
- Fix a performance regression in obligation deduplication. #116826
- Make `#[repr(Rust)]` and `#[repr(C)]` incompatible with one another #116829
- Update to LLVM 17.0.3 #116840
- Disable effects in libcore again #116856
- revert rust-lang/rust#114586 #116879

r? cuviper
This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`.
The list of excluded files is defined in `.gitattributes`.
@github-actions github-actions bot added automation Issue or PR created by an automation backport:never PR that should never be backported labels Oct 23, 2023
Copy link
Contributor

@emilyalbini emilyalbini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

@bors-ferrocene
Copy link
Contributor

Build succeeded:

  • full

@bors-ferrocene bors-ferrocene bot merged commit af74f58 into release/1.74 Oct 23, 2023
@bors-ferrocene bors-ferrocene bot deleted the automation/pull-upstream/bgcbzvjk branch October 23, 2023 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation Issue or PR created by an automation backport:never PR that should never be backported merged-in:1.74

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants