add panic location to 'panicked while processing panic' #122930
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
RalfJung
force-pushed
the
panic-in-panic-fmt
branch
from
8ba828b to
fc257fa
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 23, 2024
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#120577 (Stabilize slice_split_at_unchecked) - rust-lang#122698 (Cancel `cargo update` job if there's no updates) - rust-lang#122780 (Rename `hir::Local` into `hir::LetStmt`) - rust-lang#122915 (Delay a bug if no RPITITs were found) - rust-lang#122916 (docs(sync): normalize dot in fn summaries) - rust-lang#122921 (Enable more mir-opt tests in debug builds) - rust-lang#122922 (-Zprint-type-sizes: print the types of awaitees and unnamed coroutine locals.) - rust-lang#122927 (Change an ICE regression test to use the original reproducer) - rust-lang#122930 (add panic location to 'panicked while processing panic') - rust-lang#122931 (Fix some typos in the pin.rs) - rust-lang#122933 (tag_for_variant follow-ups) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 23, 2024
Rollup merge of rust-lang#122930 - RalfJung:panic-in-panic-fmt, r=Amanieu add panic location to 'panicked while processing panic' Fixes rust-lang#97181 r? `@Amanieu`
This was referenced Mar 23, 2024
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 24, 2024
panic-in-panic-hook: formatting a message that's just a string is risk-free This slightly improves the output in the 'panic while processing panic' case if the panic message does not involve any formatting. Follow-up to rust-lang#122930. r? `@Amanieu`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 24, 2024
panic-in-panic-hook: formatting a message that's just a string is risk-free This slightly improves the output in the 'panic while processing panic' case if the panic message does not involve any formatting. Follow-up to rust-lang#122930. r? ``@Amanieu``
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 24, 2024
Rollup merge of rust-lang#122984 - RalfJung:panic-in-hook, r=Amanieu panic-in-panic-hook: formatting a message that's just a string is risk-free This slightly improves the output in the 'panic while processing panic' case if the panic message does not involve any formatting. Follow-up to rust-lang#122930. r? ``@Amanieu``
RenjiSann
pushed a commit
to RenjiSann/rust
that referenced
this pull request
Mar 25, 2024
…nieu add panic location to 'panicked while processing panic' Fixes rust-lang#97181 r? `@Amanieu`
RenjiSann
pushed a commit
to RenjiSann/rust
that referenced
this pull request
Mar 25, 2024
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#120577 (Stabilize slice_split_at_unchecked) - rust-lang#122698 (Cancel `cargo update` job if there's no updates) - rust-lang#122780 (Rename `hir::Local` into `hir::LetStmt`) - rust-lang#122915 (Delay a bug if no RPITITs were found) - rust-lang#122916 (docs(sync): normalize dot in fn summaries) - rust-lang#122921 (Enable more mir-opt tests in debug builds) - rust-lang#122922 (-Zprint-type-sizes: print the types of awaitees and unnamed coroutine locals.) - rust-lang#122927 (Change an ICE regression test to use the original reproducer) - rust-lang#122930 (add panic location to 'panicked while processing panic') - rust-lang#122931 (Fix some typos in the pin.rs) - rust-lang#122933 (tag_for_variant follow-ups) r? `@ghost` `@rustbot` modify labels: rollup
riking
reviewed
Apr 1, 2024
| @@ -161,11 +161,12 @@ impl fmt::Display for PanicInfo<'_> { | |||
| fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { | |||
| formatter.write_str("panicked at ")?; | |||
| self.location.fmt(formatter)?; | |||
| formatter.write_str(":")?; | |||
There was a problem hiding this comment.
note that this inflates the number of write calls by 1 on normal panic paths, compared to an else branch
There was a problem hiding this comment.
Yeah, and it avoids code duplication.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #97181
r? @Amanieu