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

Win: Add dbghelp to the list of import libraries #130047

Merged
merged 1 commit into from
Sep 8, 2024

Conversation

ChrisDenton
Copy link
Member

This is used by the backtrace crate. But we use a submodule to include backtrace in std (rather than being a real crate) so we need to add the dependency here.

@rustbot
Copy link
Collaborator

rustbot commented Sep 6, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2024
@wesleywiser
Copy link
Member

I ran into this the other day on nightly, thanks for fixing before I filed an issue! 😄

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 7, 2024

📌 Commit 8966207 has been approved by wesleywiser

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 Sep 7, 2024
@workingjubilee
Copy link
Member

Does this need to be backported to beta?

@ChrisDenton
Copy link
Member Author

Oh backtrace was merged before the beta cut-off? Then yeah.

@ChrisDenton ChrisDenton added beta-nominated Nominated for backporting to the compiler in the beta channel. T-libs Relevant to the library team, which will review and decide on the PR/issue. O-windows Operating system: Windows labels Sep 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#126452 (Implement raw lifetimes and labels (`'r#ident`))
 - rust-lang#129555 (stabilize const_float_bits_conv)
 - rust-lang#129594 (explain the options bootstrap passes to curl)
 - rust-lang#129677 (Don't build by-move body when async closure is tainted)
 - rust-lang#129847 (Do not call query to compute coroutine layout for synthetic body of async closure)
 - rust-lang#129869 (add a few more crashtests)
 - rust-lang#130009 (rustdoc-search: allow trailing `Foo ->` arg search)
 - rust-lang#130046 (str: make as_mut_ptr and as_bytes_mut unstably const)
 - rust-lang#130047 (Win: Add dbghelp to the list of import libraries)
 - rust-lang#130059 (Remove the unused  `llvm-skip-rebuild` option from x.py)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0dc9f1a into rust-lang:master Sep 8, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 8, 2024
Rollup merge of rust-lang#130047 - ChrisDenton:win-dbghelp, r=wesleywiser

Win: Add dbghelp to the list of import libraries

This is used by the backtrace crate. But we use a submodule to include backtrace in std (rather than being a real crate) so we need to add the dependency here.
@workingjubilee
Copy link
Member

#129642 is part of the 1.82 milestone, yes.

@Amanieu Amanieu added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 18, 2024
@cuviper cuviper mentioned this pull request Sep 19, 2024
@cuviper cuviper modified the milestones: 1.83.0, 1.82.0 Sep 19, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2024
[beta] backports

- Don't warn empty branches unreachable for now rust-lang#129103
- Win: Add dbghelp to the list of import libraries rust-lang#130047
- `RepeatN`: use MaybeUninit rust-lang#130145
- Update LLVM to 19 327ca6c rust-lang#130212
- Revert rust-lang#129749 to fix segfault in LLVM rust-lang#130477
- Check params for unsafety in THIR rust-lang#130531

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2024
[beta] backports

- Don't warn empty branches unreachable for now rust-lang#129103
- Win: Add dbghelp to the list of import libraries rust-lang#130047
- `RepeatN`: use MaybeUninit rust-lang#130145
- Update LLVM to 19 327ca6c rust-lang#130212
- Revert rust-lang#129749 to fix segfault in LLVM rust-lang#130477
- Check params for unsafety in THIR rust-lang#130531

r? cuviper
try-job: dist-various-1
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 21, 2024
[beta] backports

- Don't warn empty branches unreachable for now rust-lang#129103
- Win: Add dbghelp to the list of import libraries rust-lang#130047
- `RepeatN`: use MaybeUninit rust-lang#130145
- Update LLVM to 19 327ca6c rust-lang#130212
- Revert rust-lang#129749 to fix segfault in LLVM rust-lang#130477
- Check params for unsafety in THIR rust-lang#130531

r? cuviper
try-job: dist-various-1
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. O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

8 participants