Conversation
Contributor
There was a problem hiding this comment.
审查总结
这是一个纯重构 PR,将 StarryOS 内核中对 axnet crate 的引用统一改为规范的 ax-net 名称。
改动内容
- 从根
Cargo.toml中移除了冗余的axnetworkspace alias(axnet = { version = "0.7.2", package = "ax-net", path = "net/ax-net" }),保留正式的ax-net = { version = "0.7.2", path = "net/ax-net" }。 - 将
os/StarryOS/kernel/Cargo.toml中依赖从axnet改为ax-net。 - 将 StarryOS 内核所有源文件(10 个文件)中的
use axnet::改为use ax_net::,包括所有函数调用路径和注释引用。 - 更新了相关的 CHANGELOG 条目。
实现逻辑
workspace 中同时存在 ax-net 和 axnet(alias)两份声明是历史遗留,axnet 只是 ax-net 的重命名别名。此 PR 将 StarryOS 内核代码统一使用规范的 crate 名称 ax-net,消除了不必要的别名层,使代码与 crate 的实际包名保持一致。
验证
cargo fmt --check:通过,无格式问题- 全文搜索确认 StarryOS 内核代码中无残留
axnet引用(Rust 源文件及 Cargo.toml) - CI 状态:全部通过(
conclusion: success)- Check formatting / run_host ✓
- Run sync-lint / run_container ✓
- Run clippy / run_host ✓
- Test starry loongarch64 qemu / run_container ✓
- Test starry self-hosted board orangepi-5-plus / run_host ✓
- Test starry self-hosted board licheerv-nano-sg2002 / run_host ✓
- Test axvisor (x86_64, aarch64, riscv64, loongarch64) qemu / run_host ✓
- Test arceos (x86_64, aarch64, loongarch64) qemu / run_host ✓
- Test axvisor self-hosted board orangepi-5-plus-linux / run_host ✓
- 其他 matrix 变体(run_container)为互斥跳过,属正常行为
重复/重叠分析
- 检查了 base 分支 (
dev):axnetalias 仅被 StarryOS 内核使用,已被本 PR 完全迁移 - 检查了所有 open PR:无与此 rename 重复或冲突的 PR
非阻塞观察
os/arceos/modules/axfs-ng/src/highlevel/file.rs:229的注释中仍有axnet引用(used by axnet UnixSocket::bind),但此文件不在本 PR 范围内且属于 axfs-ng 模块。建议后续单独清理。docs/中有几处文档引用axnet,同样不在本 PR 范围内。
结论
此 PR 是一个干净、完整的机械性重命名。所有 CI 通过,格式化正确,逻辑正确。批准合入。
Powered by deepseek-v4-pro
Contributor
There was a problem hiding this comment.
审查总结
对 PR #1220 进行了独立复核。此 PR 是一个纯重构,将 StarryOS 内核中对 axnet crate 的引用统一改为规范的 ax-net 名称。
改动清单(13 个文件,+24/-25 行)
- 根
Cargo.toml:移除冗余的axnetworkspace alias(axnet = { version = "0.7.2", package = "ax-net", path = "net/ax-net" }),保留正式的ax-net = { version = "0.7.2", path = "net/ax-net" }。 os/StarryOS/kernel/Cargo.toml:依赖从axnet改为ax-net。- 10 个 StarryOS 内核源文件:所有
use axnet::改为use ax_net::,包括函数调用路径(如ax_net::eth0_ipv4_config()、ax_net::arp_entries()等)和注释引用。 - CHANGELOG 条目(
net/ax-net/CHANGELOG.md、os/StarryOS/kernel/CHANGELOG.md):更新 scope 标记。
验证结果
| 检查项 | 结果 |
|---|---|
cargo fmt --check |
✅ 通过 |
全文搜索 axnet / use axnet:: in StarryOS kernel .rs 和 .toml |
✅ 无残留引用 |
全文搜索 axnet = in workspace Cargo.toml |
✅ 仅保留 ax-net,无 alias |
| CI(push + PR 触发,共 2 次运行) | ✅ 全部 success |
CI 详情:
- 工作流
CI(run #5997, PR 触发):conclusion: success - 工作流
CI(run #5993, push 触发):conclusion: success run_host作业全部 success;run_container作业为互斥跳过(正常矩阵行为)
重复/重叠分析
- 检查了 base 分支 (
origin/dev):axnetalias 仅被 StarryOS 内核使用,PR 已完整迁移。 - 检查了当前所有 open PR(30 个):无与此 rename 重复或冲突的 PR。
- PR #1150(IRQ binding 重构)触及
ax-driver等不同模块,与本次 rename 无重叠。
非阻塞观察
以下位置仍包含 axnet 字样,但不在本 PR 范围内,建议后续单独处理:
docs/blog/2026/05-12-april-2026-retrospective/april-2026-retrospective.md— 记录 rename 历史的博客,保留axnet是合理的。docs/docs/development/arceos.md、docs/docs/introduction/overview.md— 文档中的过时引用。os/arceos/modules/axfs-ng/src/highlevel/file.rs:229— 注释中的axnet引用。
结论
这是一个干净、完整的机械性重命名。所有引用已正确更新,CI 全绿,格式正确,无重复或冲突。批准合入。
Powered by deepseek-v4-pro
luodeb
pushed a commit
that referenced
this pull request
Jun 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.