Skip to content

chore: 回退 Rust 工具链至 nightly-2025-01-18#259

Merged
a6d9a6m merged 2 commits into
mainfrom
chore/rollback-rust-nightly-2025-01-18
Jun 2, 2026
Merged

chore: 回退 Rust 工具链至 nightly-2025-01-18#259
a6d9a6m merged 2 commits into
mainfrom
chore/rollback-rust-nightly-2025-01-18

Conversation

@a6d9a6m

@a6d9a6m a6d9a6m commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

与评测机/参考项目 SanktaOS 对齐,将工具链从 nightly-2025-10-28 回退到 nightly-2025-01-18(1.86-nightly)。同步更新三个 workflow 的工具链版本。

该版本下若干特性尚未稳定,在 crate 根显式开启:let_chains、
trait_upcasting、unsigned_is_multiple_of、ip_from(业务代码不变)。 按旧版 rustfmt 归一化 stat_ops.rs / net/stack/mod.rs 的格式(结构体 字面量末参排版风格差异)。

验证:riscv/loongarch release 均编过;两架构预编译 std 在该版本均存在, 无需 build-std;fmt --check、clippy 均通过。

与评测机/参考项目 SanktaOS 对齐,将工具链从 nightly-2025-10-28 回退到
nightly-2025-01-18(1.86-nightly)。同步更新三个 workflow 的工具链版本。

该版本下若干特性尚未稳定,在 crate 根显式开启:let_chains、
trait_upcasting、unsigned_is_multiple_of、ip_from(业务代码不变)。
按旧版 rustfmt 归一化 stat_ops.rs / net/stack/mod.rs 的格式(结构体
字面量末参排版风格差异)。

验证:riscv/loongarch release 均编过;两架构预编译 std 在该版本均存在,
无需 build-std;fmt --check、clippy 均通过。

@gemini-code-assist gemini-code-assist Bot 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.

Code Review

This pull request downgrades the Rust toolchain channel from nightly-2025-10-28 to nightly-2025-01-18 in rust-toolchain.toml. To support this older nightly version, several feature flags (let_chains, trait_upcasting, unsigned_is_multiple_of, and ip_from) are explicitly enabled in main.rs. Additionally, minor code formatting improvements are made in stat_ops.rs and mod.rs. There are no review comments, and we have no feedback to provide.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

entry.S 预留启动栈后停在 .bss.*(NOBITS)段未恢复 .text。Rust 将所有
global_asm! 块拼接为同一汇编单元,switch.S 等纯代码 .S 无自身 .section
声明、继承前块段,导致其指令落入 .bss,触发
"SHT_NOBITS section cannot have instructions"。

新版 LLVM 容忍此情形,回退到 nightly-2025-01-18 后旧版 LLVM 严格报错、
CI 构建失败。在 riscv/loongarch 两个 entry.S 末尾显式切回 .text 根治:
无论 global_asm! 拼接顺序如何,后续代码块进入时均为 .text。

验证:两架构 release/test 构建均通过,usertest 510/510。
@a6d9a6m a6d9a6m merged commit 851b04c into main Jun 2, 2026
1 check passed
@a6d9a6m a6d9a6m deleted the chore/rollback-rust-nightly-2025-01-18 branch June 2, 2026 11:51
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.

1 participant