Skip to content

Automated pull from upstream stable#2467

Merged
bors-ferrocene[bot] merged 6 commits into
release/1.97from
automation/pull-upstream-stable/766ltudn
Jul 13, 2026
Merged

Automated pull from upstream stable#2467
bors-ferrocene[bot] merged 6 commits into
release/1.97from
automation/pull-upstream-stable/766ltudn

Conversation

@ferrocene-automations

Copy link
Copy Markdown

⚠️ The automation reported these warnings: ⚠️

  • Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts.

This PR pulls the following changes from the upstream repository:

Mark-Simulacrum and others added 6 commits July 5, 2026 17:08
[stable] 1.97 release

No last minute backports this time around.

Pulled in release notes from rust-lang/rust#158871, leaving that pending for a bit more time to get feedback before we approve it for mainline.

r? me
This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`.
The list of excluded files is defined in `.gitattributes`.
@ferrocene-automations ferrocene-automations Bot added automation Issue or PR created by an automation backport:never PR that should never be backported labels Jul 13, 2026

@jyn514 jyn514 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

bors merge p=100

@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 13, 2026
2467: Automated pull from upstream `stable` r=jyn514 a=ferrocene-automations[bot]

:warning: **The automation reported these warnings:** :warning:

* Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts.

This PR pulls the following changes from the upstream repository:

* `158832`: [[stable] 1.97 release](https://www.github.com/rust-lang/rust/issues/158832)


Co-authored-by: Mark Rousskov <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

@Hoverbear Hoverbear 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

Copy link
Copy Markdown
Contributor

Build succeeded:

@bors-ferrocene
bors-ferrocene Bot merged commit c73e290 into release/1.97 Jul 13, 2026
10 checks passed
@bors-ferrocene
bors-ferrocene Bot deleted the automation/pull-upstream-stable/766ltudn branch July 13, 2026 16:42
bors-ferrocene Bot added a commit that referenced this pull request Jul 13, 2026
2456: [26.08 release] Bump release notes r=Hoverbear a=jyn514

Update release notes for 26.08 release.
See https://public-docs.ferrocene.dev/main/qualification/internal-procedures/release/stable.html#version-bump-release-notes.

This PR was created by automation on behalf of ``@jyn`` (but then i edited it because my draft automation was broken).

Rendered: 
<img width="921" height="805" alt="image" src="https://github.com/user-attachments/assets/14c42142-2240-4cef-889f-64bc7fdb4dba" />

Note that this will be missing release notes for 1.97 until #2467 is merged.

2465: Automated pull from `rust-lang/fls` r=tshepang a=ferrocene-automations[bot]

This PR pulls the following changes from the [`rust-lang/fls`](https://github.com/rust-lang/fls) repository:

* `697`: [mark a release note entry as outside FLS scope](https://www.github.com/rust-lang/fls/issues/697)
* `699`: [separate structure demo from parent chapter](https://www.github.com/rust-lang/fls/issues/699)
* `696`: [not all functions implement Fn traits](https://www.github.com/rust-lang/fls/issues/696)
* `658`: [fix "constant expression" entry regarding index expressions](https://www.github.com/rust-lang/fls/issues/658)
* `701`: [dev-guide: mention alphabet sorting](https://www.github.com/rust-lang/fls/issues/701)
* `702`: [Update watchfiles](https://www.github.com/rust-lang/fls/issues/702)
* `706`: [Add section on merge ordering in dev guide](https://www.github.com/rust-lang/fls/issues/706)
* `709`: [Document if let guards](https://www.github.com/rust-lang/fls/issues/709)
* `694`: [document missing import restrictions](https://www.github.com/rust-lang/fls/issues/694)


Co-authored-by: Jynn Nelson <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
Co-authored-by: Hristian Kirtchev <[email protected]>
Co-authored-by: Eric Huss <[email protected]>
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.

4 participants