Skip to content

Rustup - #2281

Merged
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:rustup
Jun 29, 2022
Merged

Rustup#2281
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:rustup

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Fix our stacktrace after rust-lang/rust#98549. Now we can control whether caller_location should be pruned!

= note: inside `std::panicking::rust_panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
= note: inside `std::sys_common::backtrace::__rust_end_short_backtrace::<[closure@std::rt::begin_panic<&str>::{closure#0}], !>` at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
= note: inside `std::rt::begin_panic::<&str>` at RUSTLIB/std/src/panicking.rs:LL:CC

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We now prune a but more than before since we remove all #[caller_location] frames, not just the ones at the top. IMO that makes sense. If it doesn't, we should also adjust the same in CTFE.

Cc @saethlin

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree this makes sense.

@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+

@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

📌 Commit f389d46 has been approved by RalfJung

bors added a commit that referenced this pull request Jun 29, 2022
Rustup

Fix our stacktrace after rust-lang/rust#98549. Now we can control whether `caller_location` should be pruned!
@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit f389d46 with merge a2ce962...

@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+

@RalfJung RalfJung closed this Jun 29, 2022
@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

📌 Commit f389d46 has been approved by RalfJung

@RalfJung RalfJung reopened this Jun 29, 2022
@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+

@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

📌 Commit 839c120 has been approved by RalfJung

@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit 839c120 with merge 63d6605...

@bors

bors commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 63d6605 to master...

@bors
bors merged commit 63d6605 into rust-lang:master Jun 29, 2022
@RalfJung
RalfJung deleted the rustup branch June 29, 2022 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants