Skip to content

Commit

Permalink
Use workspace rust-version for all workspace crates (apache#14009)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jefffrey authored and wiedld committed Jan 6, 2025
1 parent 87a5784 commit 5a48e59
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 14 deletions.
1 change: 0 additions & 1 deletion datafusion-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 1 addition & 4 deletions datafusion/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions datafusion/ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion datafusion/proto-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion datafusion/proto-common/gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 1 addition & 2 deletions datafusion/proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion datafusion/proto/gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 1 addition & 2 deletions datafusion/substrait/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5a48e59

Please sign in to comment.