Skip to content

Commit 3428a55

Browse files
committed
[AURON #1996] Standardize Cargo workspace edition and resolver configuration
Signed-off-by: slfan1989 <slfan1989@apache.org>
1 parent 02c0a28 commit 3428a55

9 files changed

Lines changed: 21 additions & 15 deletions

File tree

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#
1717

1818
[workspace]
19+
resolver = "2"
1920
members = [
2021
"native-engine/datafusion-ext-commons",
2122
"native-engine/datafusion-ext-exprs",
@@ -27,6 +28,9 @@ members = [
2728
"native-engine/auron-memmgr",
2829
]
2930

31+
[workspace.package]
32+
edition = "2024"
33+
3034
[workspace.lints.rust]
3135
# Pending processing (temporarily allow)
3236
unused_variables = "allow"

native-engine/auron-jni-bridge/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
name = "auron-jni-bridge"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
23-
resolver = "1"
22+
edition.workspace = true
23+
2424
[lints]
2525
workspace = true
2626

native-engine/auron-memmgr/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
name = "auron-memmgr"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
22+
edition.workspace = true
23+
2324
[lints]
2425
workspace = true
2526

native-engine/auron-planner/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
name = "auron-planner"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
22+
edition.workspace = true
23+
2324
[lints]
2425
workspace = true
2526

native-engine/auron/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
name = "auron"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
23-
resolver = "1"
22+
edition.workspace = true
23+
2424
[lints]
2525
workspace = true
2626

@@ -68,7 +68,7 @@ optional = true
6868
features = ["disable_initial_exec_tls"]
6969

7070
[dependencies.jemalloc_pprof]
71-
version = "0.8.2"
71+
version = "0.8.0"
7272
features = ["symbolize"]
7373
optional = true
7474

native-engine/datafusion-ext-commons/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
name = "datafusion-ext-commons"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
23-
resolver = "1"
22+
edition.workspace = true
23+
2424
[lints]
2525
workspace = true
2626

native-engine/datafusion-ext-exprs/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
name = "datafusion-ext-exprs"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
23-
resolver = "1"
22+
edition.workspace = true
23+
2424
[lints]
2525
workspace = true
2626

native-engine/datafusion-ext-functions/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
name = "datafusion-ext-functions"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
23-
resolver = "1"
22+
edition.workspace = true
23+
2424
[lints]
2525
workspace = true
2626

native-engine/datafusion-ext-plans/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
name = "datafusion-ext-plans"
2020
version = "0.1.0"
2121
license = "Apache-2.0"
22-
edition = "2024"
23-
resolver = "1"
22+
edition.workspace = true
23+
2424
[lints]
2525
workspace = true
2626

0 commit comments

Comments
 (0)