[AURON #1996] Standardize Cargo workspace edition and resolver configuration.#1997
[AURON #1996] Standardize Cargo workspace edition and resolver configuration.#1997slfan1989 wants to merge 2 commits intoapache:masterfrom
Conversation
|
@cxzl25 @richox Could you please review this PR? Thanks a lot! I think we should set resolver = "2", since that’s how it’s configured in iceberg-rust as well. https://github.com/apache/iceberg-rust/blob/5cec0f36084a7cab2da2bc52abe27e7594f5d574/Cargo.toml#L29 |
…configuration. Signed-off-by: slfan1989 <slfan1989@apache.org>
bc6a9f0 to
a89b52a
Compare
There was a problem hiding this comment.
Pull request overview
This PR standardizes the Cargo workspace configuration by centralizing edition and resolver settings, fixing incorrect resolver declarations in individual crates, and upgrading to resolver version 2 for improved dependency resolution.
Changes:
- Added
resolver = "2"and[workspace.package]withedition = "2024"to root Cargo.toml - Updated all 8 workspace member crates to inherit edition using
edition.workspace = true - Removed invalid
resolver = "1"declarations from 6 individual crate manifests (resolver should only be at workspace level)
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| Cargo.toml | Added workspace-level resolver 2 and centralized edition configuration |
| native-engine/datafusion-ext-plans/Cargo.toml | Removed duplicate edition and invalid resolver, now inherits from workspace |
| native-engine/datafusion-ext-functions/Cargo.toml | Removed duplicate edition and invalid resolver, now inherits from workspace |
| native-engine/datafusion-ext-exprs/Cargo.toml | Removed duplicate edition and invalid resolver, now inherits from workspace |
| native-engine/datafusion-ext-commons/Cargo.toml | Removed duplicate edition and invalid resolver, now inherits from workspace |
| native-engine/auron/Cargo.toml | Removed duplicate edition and invalid resolver, now inherits from workspace |
| native-engine/auron-planner/Cargo.toml | Removed duplicate edition, now inherits from workspace |
| native-engine/auron-memmgr/Cargo.toml | Removed duplicate edition, now inherits from workspace |
| native-engine/auron-jni-bridge/Cargo.toml | Removed duplicate edition and invalid resolver, now inherits from workspace |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Which issue does this PR close?
Closes #1996
Rationale for this change
Standardize the Cargo workspace configuration to ensure consistent dependency resolution and edition settings across all crates.
This change:
Resolver 2 is the default resolver for Rust 2021 edition and provides improved dependency version resolution strategy.
What changes are included in this PR?
resolver = "2"to the workspace configuration[workspace.package]section with unifiededition = "2024"edition.workspace = trueresolver = "1"declarations from 6 sub-cratesAre there any user-facing changes?
No.
How was this patch tested?
Verified with
cargo check --workspace- all crates compile successfully with the unified configuration.