Skip to content

Update backtrace submodule#118137

Merged
bors merged 1 commit intorust-lang:masterfrom
roblabla:update-backtrace
Nov 21, 2023
Merged

Update backtrace submodule#118137
bors merged 1 commit intorust-lang:masterfrom
roblabla:update-backtrace

Conversation

@roblabla
Copy link
Contributor

@roblabla roblabla commented Nov 21, 2023 •
edited
Loading

This PR updates the backtrace submodule, avoiding panics when resolving backtraces on Windows 7:

Fixes #117941

I ran the std unit tests locally on a Windows7 machine, and can confirm that this indeed fixes #117941.

@rustbot
Copy link
Collaborator

rustbot commented Nov 21, 2023

r? @Mark-Simulacrum

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

@rustbot
Copy link
Collaborator

rustbot commented Nov 21, 2023

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 21, 2023
@ChrisDenton ChrisDenton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 21, 2023
@ChrisDenton
Copy link
Member

ChrisDenton commented Nov 21, 2023

I've nominated this for a beta backport as otherwise we'd be breaking Windows 7 on the next stable release. We should avoid doing that until 1.76 at the earliest.

@ChrisDenton
Copy link
Member

ChrisDenton commented Nov 21, 2023

@bors r=ChrisDenton

@bors
Copy link
Collaborator

bors commented Nov 21, 2023

📌 Commit 08803eb has been approved by ChrisDenton

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 Nov 21, 2023
@bors
Copy link
Collaborator

bors commented Nov 21, 2023

⌛ Testing commit 08803eb with merge 2f8d81f...

@wesleywiser
Copy link
Member

wesleywiser commented Nov 21, 2023

Thank you so much @roblabla for fixing this and testing on Win 7!

Just to ensure this stays near the top of the bors queue if a retry is needed:

@bors p=1

Fixes stable-to-beta regression

@bors
Copy link
Collaborator

bors commented Nov 21, 2023

☀️ Test successful - checks-actions
Approved by: ChrisDenton
Pushing 2f8d81f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 21, 2023
@bors bors merged commit 2f8d81f into rust-lang:master Nov 21, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 21, 2023
@rust-timer
Copy link
Collaborator

rust-timer commented Nov 22, 2023

Finished benchmarking commit (2f8d81f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.6% [0.6%, 0.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.5% [2.2%, 3.2%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 676.058s -> 679.348s (0.49%)
Artifact size: 313.78 MiB -> 313.77 MiB (-0.00%)

@roblabla
Copy link
Contributor Author

roblabla commented Dec 5, 2023

Heyo, is there a way to track the backporting process? It kinda looks like it fell through the cracks (all previously beta-nominated PRs have been accepted/rejected), and I'd be interested in seeing if there's any question I can help with.

(Also, I think this is missing a team label? I assume t-libs).

@Mark-Simulacrum Mark-Simulacrum added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Dec 5, 2023
@Amanieu Amanieu added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Dec 6, 2023
@Amanieu
Copy link
Member

Amanieu commented Dec 6, 2023

Beta-accepted as per libs team meeting.

@cuviper cuviper mentioned this pull request Dec 11, 2023
Merged
@cuviper cuviper modified the milestones: 1.76.0, 1.75.0 Dec 11, 2023
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 11, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2023
@bors
Auto merge of rust-lang#118837 - cuviper:beta-next, r=cuviper
a51f527 
[beta] Update backtrace submodule

*  Update backtrace submodule rust-lang#118137

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 13, 2023
@bors
Auto merge of rust-lang#118837 - cuviper:beta-next, r=cuviper
4bd9c37 
[beta] Update backtrace submodule

*  Update backtrace submodule rust-lang#118137

As well as infrastructure fix:

*  Don't ask for a specific branch in cargotest rust-lang#118597

r? ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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

Milestone

1.75.0

Development

Successfully merging this pull request may close these issues.

error_with_backtrace_outputs_correctly_with_one_source fails on Windows7

9 participants

@roblabla @rustbot @ChrisDenton @bors @wesleywiser @rust-timer @Amanieu @cuviper @Mark-Simulacrum