From 54b99d6bee2a4d81c93d6db9b2800eaa52d6b92e Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Sun, 5 Jan 2025 12:13:12 +1100 Subject: [PATCH] Use workspace rust-version for all workspace crates --- datafusion-cli/Cargo.toml | 1 - datafusion/core/Cargo.toml | 5 +---- datafusion/ffi/Cargo.toml | 3 +-- datafusion/proto-common/Cargo.toml | 2 +- datafusion/proto-common/gen/Cargo.toml | 2 +- datafusion/proto/Cargo.toml | 3 +-- datafusion/proto/gen/Cargo.toml | 2 +- datafusion/substrait/Cargo.toml | 3 +-- 8 files changed, 7 insertions(+), 14 deletions(-) diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml index 19a68d737feb4..ea925645a7d77 100644 --- a/datafusion-cli/Cargo.toml +++ b/datafusion-cli/Cargo.toml @@ -25,7 +25,6 @@ keywords = ["arrow", "datafusion", "query", "sql"] license = "Apache-2.0" homepage = "https://datafusion.apache.org" repository = "https://github.com/apache/datafusion" -# Specify MSRV here as `cargo msrv` doesn't support workspace version rust-version = "1.80.1" readme = "README.md" diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index 7a458f8e9bbbe..97b88a0b0c3dd 100644 --- a/datafusion/core/Cargo.toml +++ b/datafusion/core/Cargo.toml @@ -27,10 +27,7 @@ homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } authors = { workspace = true } -# Specify MSRV here as `cargo msrv` doesn't support workspace version and fails with -# "Unable to find key 'package.rust-version' (or 'package.metadata.msrv') in 'arrow-datafusion/Cargo.toml'" -# https://github.com/foresterre/cargo-msrv/issues/590 -rust-version = "1.80.1" +rust-version = { workspace = true } [lints] workspace = true diff --git a/datafusion/ffi/Cargo.toml b/datafusion/ffi/Cargo.toml index fb4701cd89884..a0179ec44d7f0 100644 --- a/datafusion/ffi/Cargo.toml +++ b/datafusion/ffi/Cargo.toml @@ -25,8 +25,7 @@ homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } authors = { workspace = true } -# Specify MSRV here as `cargo msrv` doesn't support workspace version -rust-version = "1.80.1" +rust-version = { workspace = true } [lints] workspace = true diff --git a/datafusion/proto-common/Cargo.toml b/datafusion/proto-common/Cargo.toml index ba99f8639d423..3454b26ebcf6f 100644 --- a/datafusion/proto-common/Cargo.toml +++ b/datafusion/proto-common/Cargo.toml @@ -26,7 +26,7 @@ homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } authors = { workspace = true } -rust-version = "1.80.1" +rust-version = { workspace = true } # Exclude proto files so crates.io consumers don't need protoc exclude = ["*.proto"] diff --git a/datafusion/proto-common/gen/Cargo.toml b/datafusion/proto-common/gen/Cargo.toml index 21fc9eccb40c5..28e45fee90396 100644 --- a/datafusion/proto-common/gen/Cargo.toml +++ b/datafusion/proto-common/gen/Cargo.toml @@ -20,7 +20,7 @@ name = "gen-common" description = "Code generation for proto" version = "0.1.0" edition = { workspace = true } -rust-version = "1.80.1" +rust-version = { workspace = true } authors = { workspace = true } homepage = { workspace = true } repository = { workspace = true } diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml index 63cc440c4583c..7f714d4253429 100644 --- a/datafusion/proto/Cargo.toml +++ b/datafusion/proto/Cargo.toml @@ -26,8 +26,7 @@ homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } authors = { workspace = true } -# Specify MSRV here as `cargo msrv` doesn't support workspace version -rust-version = "1.80.1" +rust-version = { workspace = true } # Exclude proto files so crates.io consumers don't need protoc exclude = ["*.proto"] diff --git a/datafusion/proto/gen/Cargo.toml b/datafusion/proto/gen/Cargo.toml index dda72d20a159f..33c815d149004 100644 --- a/datafusion/proto/gen/Cargo.toml +++ b/datafusion/proto/gen/Cargo.toml @@ -20,7 +20,7 @@ name = "gen" description = "Code generation for proto" version = "0.1.0" edition = { workspace = true } -rust-version = "1.80.1" +rust-version = { workspace = true } authors = { workspace = true } homepage = { workspace = true } repository = { workspace = true } diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml index 5d5bf5ba49dcd..60e35cc966d2f 100644 --- a/datafusion/substrait/Cargo.toml +++ b/datafusion/substrait/Cargo.toml @@ -25,8 +25,7 @@ homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } authors = { workspace = true } -# Specify MSRV here as `cargo msrv` doesn't support workspace version -rust-version = "1.80.1" +rust-version = { workspace = true } [lints] workspace = true