Skip to content

Conversation

@slfan1989
Copy link
Contributor

@slfan1989 slfan1989 commented Feb 10, 2026

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:

  • Upgrades workspace to use resolver 2 for improved dependency resolution
  • Centralizes edition configuration at the workspace level
  • Removes conflicting resolver and edition settings from individual crates

Resolver 2 is the default resolver for Rust 2021 edition and provides improved dependency version resolution strategy.

What changes are included in this PR?

  • Add resolver = "2" to the workspace configuration
  • Add [workspace.package] section with unified edition = "2024"
  • Update all 8 sub-crates to inherit edition from workspace using edition.workspace = true
  • Remove conflicting resolver = "1" declarations from 6 sub-crates

Are there any user-facing changes?

No.

How was this patch tested?

Verified with cargo check --workspace - all crates compile successfully with the unified configuration.

@github-actions github-actions bot added the build label Feb 10, 2026
@slfan1989
Copy link
Contributor Author

@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

@slfan1989 slfan1989 changed the title [AURON #1996] Upgrade Cargo workspace to use resolver 2. [AURON #1996] Standardize Cargo workspace edition and resolver configuration. Feb 10, 2026
…configuration.

Signed-off-by: slfan1989 <slfan1989@apache.org>
Copy link
Contributor

@ShreyeshArangath ShreyeshArangath left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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] with edition = "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.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Standardize Cargo workspace edition and resolver configuration

2 participants