Skip to content

Backport to release/1.97#2487

Merged
bors-ferrocene[bot] merged 4 commits into
release/1.97from
automation/backport/wkw1kiyh
Jul 16, 2026
Merged

Backport to release/1.97#2487
bors-ferrocene[bot] merged 4 commits into
release/1.97from
automation/backport/wkw1kiyh

Conversation

@ferrocene-automations

@ferrocene-automations ferrocene-automations Bot commented Jul 16, 2026

Copy link
Copy Markdown

This PR backports the following PRs to the release/1.97 branch:

Note that the automation failed to backport some PRs automatically. Check out the backport:manual for a list of them.

Add `Option::get_or_insert_with` to certified core subset

None

Ferrocene-backport-of: #2429
Ferrocene-backported-commits: 48ab662
Add `slice::<impl Default for &mut [u8]>::default` to certified core subset

None

Ferrocene-backport-of: #2433
Ferrocene-backported-commits: 7989db7
@ferrocene-automations ferrocene-automations Bot added automation Issue or PR created by an automation backport:never PR that should never be backported labels Jul 16, 2026

@tshepang tshepang left a comment

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.

bors merge

bors-ferrocene Bot added a commit that referenced this pull request Jul 16, 2026
2487: Backport to `release/1.97` r=tshepang a=ferrocene-automations[bot]

This PR backports the following PRs to the `release/1.97` branch:

* #2429
* #2433
* #2388
* #2475

Note that the automation failed to backport some PRs automatically. Check out the [backport:manual](https://github.com/ferrocene/ferrocene/pulls?q=is%3Apr+label%3Abackport%3Amanual) for a list of them.

Co-authored-by: Urhengulas <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
Co-authored-by: Felix Gilcher <[email protected]>
@jyn514

jyn514 commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

bors r-

let's merge more at once here so we don't have to wait so long for bors. the #2388 merge is also incorrect and will probably fail CI.

@bors-ferrocene

Copy link
Copy Markdown
Contributor

Canceled.

Xylakant and others added 2 commits July 16, 2026 12:04
make the llvm-builder for windows an xlarge machine

this change chops 50 minutes of the llvm build. While the runner is nearly twice as expensive as the large runner, cutting the time in half makes up for the cost increase

Ferrocene-backport-of: #2475
Ferrocene-backported-commits: 889d018
Expand coverage to include recent changes

#2336 fixed a number of bugs in the `#[ferrocene::prevalidated]` lint, this handles coverage coming from those changes.

Co-authored-by: Ana Hobden <[email protected]>

Ferrocene-backport-of: #2364
Ferrocene-backported-commits: 3721072 5808810 fdb51f2 f9dff13 5052acc a9304f9 1951cfa 9d1dbcd 047f112 45d607b 0188b6c b9b6949 04c0639 d835001 a0fa6f0 9996cb7 904d211 b79e758 bd9d73d 78f6a9b bc5cb1f c92b3ec 5fa8097 733a418
@jyn514
jyn514 force-pushed the automation/backport/wkw1kiyh branch from 1fc0926 to afdf1b9 Compare July 16, 2026 10:05
@jyn514

jyn514 commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

bors merge

@bors-ferrocene

Copy link
Copy Markdown
Contributor

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

bors-ferrocene Bot added a commit that referenced this pull request Jul 16, 2026
2487: Backport to `release/1.97` r=jyn514 a=ferrocene-automations[bot]

This PR backports the following PRs to the `release/1.97` branch:

* #2429
* #2433
* #2364 (currently unmerged)
* #2475

Note that the automation failed to backport some PRs automatically. Check out the [backport:manual](https://github.com/ferrocene/ferrocene/pulls?q=is%3Apr+label%3Abackport%3Amanual) for a list of them.

Co-authored-by: Urhengulas <[email protected]>
Co-authored-by: Felix Gilcher <[email protected]>
Co-authored-by: Ana Hobden <[email protected]>
@bors-ferrocene

Copy link
Copy Markdown
Contributor

Build failed:

  • full

@jyn514

jyn514 commented Jul 16, 2026

Copy link
Copy Markdown
Contributor
.....ii..test string::test_reserve_exact has been running for a long time

Build completed unsuccessfully in 0:26:34

Too long with no output (exceeded 20m0s): context deadline exceeded

lovely

bors retry

bors-ferrocene Bot added a commit that referenced this pull request Jul 16, 2026
2487: Backport to `release/1.97` r=jyn514 a=ferrocene-automations[bot]

This PR backports the following PRs to the `release/1.97` branch:

* #2429
* #2433
* #2364 (currently unmerged)
* #2475

Note that the automation failed to backport some PRs automatically. Check out the [backport:manual](https://github.com/ferrocene/ferrocene/pulls?q=is%3Apr+label%3Abackport%3Amanual) for a list of them.

Co-authored-by: Urhengulas <[email protected]>
Co-authored-by: Felix Gilcher <[email protected]>
Co-authored-by: Ana Hobden <[email protected]>
@bors-ferrocene

Copy link
Copy Markdown
Contributor

Build failed:

@tshepang

Copy link
Copy Markdown
Member

bors retry

@bors-ferrocene

Copy link
Copy Markdown
Contributor

Build succeeded:

@bors-ferrocene
bors-ferrocene Bot merged commit 0c32431 into release/1.97 Jul 16, 2026
4 checks passed
@bors-ferrocene
bors-ferrocene Bot deleted the automation/backport/wkw1kiyh branch July 16, 2026 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation Issue or PR created by an automation backport:never PR that should never be backported merged-in:1.97

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants