Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade std to gimli 0.28.0 #114825

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Upgrade std to gimli 0.28.0 #114825

merged 1 commit into from
Aug 15, 2023

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Aug 14, 2023

Gimli 0.28 removed its From<EndianSlice> for &[u8] that was the root cause of #113238.

This dependency update mirrors rust-lang/backtrace-rs#557, but since that doesn't require any code changes in backtrace, we can also apply that right away for our nested std/backtrace feature.

@rustbot
Copy link
Collaborator

rustbot commented Aug 14, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot 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-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 14, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@cuviper
Copy link
Member Author

cuviper commented Aug 14, 2023

I also hope to get this into 1.72-beta before its release next week.

@rustbot label +beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 14, 2023
@cuviper
Copy link
Member Author

cuviper commented Aug 14, 2023

Hmm, looks like #113658 just landed and updated these too. I will refactor this to just my regression test, but for beta backport we'll still need the dependency changes as well, especially std -> addr2line 0.21.

@cuviper
Copy link
Member Author

cuviper commented Aug 15, 2023

Here's what it looks like for 1.72-beta:
beta...cuviper:rust:beta-gimli-0.28

@compiler-errors
Copy link
Member

@bors r+ rollup (since it's just a regression test)

untagging T-compiler from the tags so it's clear that this is a T-libs beta nomination (unless you think this should be backport nominated for T-compiler or something 😺)

@bors
Copy link
Contributor

bors commented Aug 15, 2023

📌 Commit 677afb4 has been approved by compiler-errors

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 Aug 15, 2023
@compiler-errors compiler-errors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 15, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 15, 2023
…llaumeGomez

Rollup of 10 pull requests

Successful merges:

 - rust-lang#114711 (Infer `Lld::No` linker hint when the linker stem is a generic compiler driver)
 - rust-lang#114772 (Add `{Local}ModDefId` to more strongly type DefIds`)
 - rust-lang#114800 (std: add some missing repr(transparent))
 - rust-lang#114820 (Add test for unknown_lints from another file.)
 - rust-lang#114825 (Upgrade std to gimli 0.28.0)
 - rust-lang#114827 (Only consider object candidates for object-safe dyn types in new solver)
 - rust-lang#114828 (Probe when assembling upcast candidates so they don't step on eachother's toes in new solver)
 - rust-lang#114829 (Separate `consider_unsize_to_dyn_candidate` from other unsize candidates)
 - rust-lang#114830 (Clean up some bad UI testing annotations)
 - rust-lang#114831 (Check projection args before substitution in new solver)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0e7f9e5 into rust-lang:master Aug 15, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Aug 15, 2023
@m-ou-se m-ou-se added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 16, 2023
@cuviper cuviper mentioned this pull request Aug 18, 2023
@cuviper cuviper modified the milestones: 1.73.0, 1.72.0 Aug 18, 2023
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 18, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 18, 2023
[beta] backports

* Upgrade std to gimli 0.28.0 rust-lang#114825
* Partially revert rust-lang#107200 rust-lang#114897
* Permit pre-evaluated constants in simd_shuffle rust-lang#113529

r? cuviper
@cuviper cuviper deleted the gimli-0.28 branch August 20, 2023 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants