Skip to content

Add delay_span_bug to AttrWrapper::take_for_recovery #104362

New issue

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

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

Already on GitHub? # to your account

Merged

Conversation

WaffleLapkin
Copy link
Member

take_for_recovery should only be used for recovery (when we should already have an error), so using delay_span_bug seems appropriate.

cc @Aaron1011 (you've added the FIXME that this pr fixes)

@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2022

r? @nagisa

(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. labels Nov 13, 2022
@Aaron1011
Copy link
Member

r? @Aaron1011 @bors r+

@bors
Copy link
Collaborator

bors commented Nov 13, 2022

📌 Commit df86ad8 has been approved by Aaron1011

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2022
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 13, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 14, 2022
…earth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#103709 (ci: Upgrade dist-x86_64-netbsd to NetBSD 9.0)
 - rust-lang#103744 (Upgrade cc for working is_flag_supported on cross-compiles)
 - rust-lang#104105 (llvm: dwo only emitted when object code emitted)
 - rust-lang#104158 (Return .efi extension for EFI executable)
 - rust-lang#104181 (Add a few known-bug tests)
 - rust-lang#104266 (Regression test for coercion of mut-ref to dyn-star)
 - rust-lang#104300 (Document `Path::parent` behavior around relative paths)
 - rust-lang#104304 (Enable profiler in dist-s390x-linux)
 - rust-lang#104362 (Add `delay_span_bug` to `AttrWrapper::take_for_recovery`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4fdd944 into rust-lang:master Nov 14, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 14, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants