[PR #7925] [MERGED] Upgrade Rust edition (Do not merge into 0.9.2 version) #8216

New issue

Closed

opened 2026-03-23 23:23:09 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 23:23:09 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/7925
Author: @appflowy
Created: 5/13/2025
Status: ✅ Merged
Merged: 5/14/2025
Merged by: @appflowy

Base: main ← Head: rust_edition

📝 Commits (8)

45717b8 chore: compile
40ddc56 chore: bump rust edition
fc893b8 chore: bump rust tool chain version
75ee579 chore: fix test
57adb64 chore: fmt
1eca0cd chore: build target
2b88a5e chore: clippy
3b207d5 chore: fmt

📊 Changes

187 files changed (+442 additions, -462 deletions)

View changed files

📝 .github/workflows/android_ci.yaml.bak (+1 -1)
📝 .github/workflows/flutter_ci.yaml (+1 -1)
📝 .github/workflows/ios_ci.yaml (+1 -1)
📝 .github/workflows/release.yml (+1 -1)
📝 .github/workflows/rust_ci.yaml (+1 -1)
📝 .github/workflows/rust_coverage.yml (+1 -1)
📝 frontend/rust-lib/Cargo.lock (+0 -1)
📝 frontend/rust-lib/build-tool/flowy-codegen/Cargo.toml (+1 -1)
📝 frontend/rust-lib/build-tool/flowy-codegen/src/dart_event/dart_event.rs (+2 -2)
📝 frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/ast.rs (+2 -2)
📝 frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/mod.rs (+2 -2)
📝 frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/proto_gen.rs (+3 -3)
📝 frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/proto_info.rs (+1 -1)
📝 frontend/rust-lib/build-tool/flowy-codegen/src/ts_event/mod.rs (+3 -3)
📝 frontend/rust-lib/collab-integrate/Cargo.toml (+1 -1)
📝 frontend/rust-lib/collab-integrate/src/collab_builder.rs (+5 -9)
📝 frontend/rust-lib/collab-integrate/src/config.rs (+5 -3)
📝 frontend/rust-lib/collab-integrate/src/lib.rs (+1 -1)
📝 frontend/rust-lib/flowy-ai-pub/Cargo.toml (+1 -1)
📝 frontend/rust-lib/flowy-ai-pub/src/cloud.rs (+1 -1)

...and 80 more files

📄 Description

Feature Preview

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

Summary by Sourcery

Upgrade project Rust edition and toolchain, update CI workflows, and adjust code to comply with the new edition

Enhancements:

Wrap environment variable assignments in unsafe blocks in various config modules
Rename code generation functions from gen to raw identifier r#gen to avoid keyword conflicts
Remove unused pin-project dependency from flowy-ai crate

Build:

Bump edition from 2021 to 2024 in multiple Cargo.toml manifests
Add clippy and rustfmt components to front-end toolchain configuration

CI:

Update GitHub Actions workflows to use Rust 1.85.0 instead of 1.84.0

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/7925 **Author:** [@appflowy](https://github.com/appflowy) **Created:** 5/13/2025 **Status:** ✅ Merged **Merged:** 5/14/2025 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `rust_edition` --- ### 📝 Commits (8) - [`45717b8`](https://github.com/AppFlowy-IO/AppFlowy/commit/45717b8f396e33ea81e23dae6dee25cf05d80a80) chore: compile - [`40ddc56`](https://github.com/AppFlowy-IO/AppFlowy/commit/40ddc562b2f00dcda911d97b4d0038d7bee62dc5) chore: bump rust edition - [`fc893b8`](https://github.com/AppFlowy-IO/AppFlowy/commit/fc893b8db40befbcc33d7fa8a88cfe580b25b179) chore: bump rust tool chain version - [`75ee579`](https://github.com/AppFlowy-IO/AppFlowy/commit/75ee579d37da060d131ab80116f52d3749cbb791) chore: fix test - [`57adb64`](https://github.com/AppFlowy-IO/AppFlowy/commit/57adb6406b3c06afdc5282ae9f22f0e1a185e746) chore: fmt - [`1eca0cd`](https://github.com/AppFlowy-IO/AppFlowy/commit/1eca0cd67c87e472141fe549dcef45c0eb7d0203) chore: build target - [`2b88a5e`](https://github.com/AppFlowy-IO/AppFlowy/commit/2b88a5e586b8afebe730ac4ee7cf41b07f6d497c) chore: clippy - [`3b207d5`](https://github.com/AppFlowy-IO/AppFlowy/commit/3b207d56b173751aa9732661ba3c8829d0838a26) chore: fmt ### 📊 Changes **187 files changed** (+442 additions, -462 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/android_ci.yaml.bak` (+1 -1) 📝 `.github/workflows/flutter_ci.yaml` (+1 -1) 📝 `.github/workflows/ios_ci.yaml` (+1 -1) 📝 `.github/workflows/release.yml` (+1 -1) 📝 `.github/workflows/rust_ci.yaml` (+1 -1) 📝 `.github/workflows/rust_coverage.yml` (+1 -1) 📝 `frontend/rust-lib/Cargo.lock` (+0 -1) 📝 `frontend/rust-lib/build-tool/flowy-codegen/Cargo.toml` (+1 -1) 📝 `frontend/rust-lib/build-tool/flowy-codegen/src/dart_event/dart_event.rs` (+2 -2) 📝 `frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/ast.rs` (+2 -2) 📝 `frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/mod.rs` (+2 -2) 📝 `frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/proto_gen.rs` (+3 -3) 📝 `frontend/rust-lib/build-tool/flowy-codegen/src/protobuf_file/proto_info.rs` (+1 -1) 📝 `frontend/rust-lib/build-tool/flowy-codegen/src/ts_event/mod.rs` (+3 -3) 📝 `frontend/rust-lib/collab-integrate/Cargo.toml` (+1 -1) 📝 `frontend/rust-lib/collab-integrate/src/collab_builder.rs` (+5 -9) 📝 `frontend/rust-lib/collab-integrate/src/config.rs` (+5 -3) 📝 `frontend/rust-lib/collab-integrate/src/lib.rs` (+1 -1) 📝 `frontend/rust-lib/flowy-ai-pub/Cargo.toml` (+1 -1) 📝 `frontend/rust-lib/flowy-ai-pub/src/cloud.rs` (+1 -1) _...and 80 more files_ </details> ### 📄 Description   ### Feature Preview  ---  #### PR Checklist - [ ] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. ## Summary by Sourcery Upgrade project Rust edition and toolchain, update CI workflows, and adjust code to comply with the new edition Enhancements: - Wrap environment variable assignments in unsafe blocks in various config modules - Rename code generation functions from `gen` to raw identifier `r#gen` to avoid keyword conflicts - Remove unused `pin-project` dependency from `flowy-ai` crate Build: - Bump edition from 2021 to 2024 in multiple Cargo.toml manifests - Add `clippy` and `rustfmt` components to front-end toolchain configuration CI: - Update GitHub Actions workflows to use Rust 1.85.0 instead of 1.84.0 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>