Increase minimum supported Rust version (MSRV) to 1.80.1 (#13667)

* Increase minimum supported Rust version (MSRV) to 1.80.1 We currently require 1.80, but we also say that > If a hotfix is released for the minimum supported Rust version (MSRV), > the MSRV will be the minor version with all hotfixes therefore we should requite 1.80.1 and thus allow dependencies that require 1.80.1 (such as substrait) * Revert "fix: cargo msrv check failed (#13654)" This reverts commit c510ab4.
apache · Dec 5, 2024 · 2464703 · 2464703
1 parent b30edc8
commit 2464703
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -585,9 +585,9 @@ jobs:
           #
           # To reproduce: 
           # 1. Install the version of Rust that is failing. Example: 
-          #    rustup install 1.80.0
+          #    rustup install 1.80.1
           # 2. Run the command that failed with that version. Example:
-          #    cargo +1.80.0 check -p datafusion
+          #    cargo +1.80.1 check -p datafusion
           # 
           # To resolve, either:
           # 1. Change your code to use older Rust features, 

diff --git a/Cargo.toml b/Cargo.toml
@@ -65,7 +65,7 @@ homepage = "https://datafusion.apache.org"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/apache/datafusion"
-rust-version = "1.80"
+rust-version = "1.80.1"
 version = "43.0.0"
 
 [workspace.dependencies]

diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
@@ -26,7 +26,7 @@ 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"
+rust-version = "1.80.1"
 readme = "README.md"
 
 [dependencies]

diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml
@@ -30,7 +30,7 @@ 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"
+rust-version = "1.80.1"
 
 [lints]
 workspace = true

diff --git a/datafusion/ffi/Cargo.toml b/datafusion/ffi/Cargo.toml
@@ -26,7 +26,7 @@ repository = { workspace = true }
 license = { workspace = true }
 authors = { workspace = true }
 # Specify MSRV here as `cargo msrv` doesn't support workspace version
-rust-version = "1.80"
+rust-version = "1.80.1"
 
 [lints]
 workspace = true

diff --git 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"
+rust-version = "1.80.1"
 
 # 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
@@ -20,7 +20,7 @@ name = "gen-common"
 description = "Code generation for proto"
 version = "0.1.0"
 edition = { workspace = true }
-rust-version = "1.80"
+rust-version = "1.80.1"
 authors = { workspace = true }
 homepage = { workspace = true }
 repository = { workspace = true }

diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml
@@ -27,7 +27,7 @@ repository = { workspace = true }
 license = { workspace = true }
 authors = { workspace = true }
 # Specify MSRV here as `cargo msrv` doesn't support workspace version
-rust-version = "1.80"
+rust-version = "1.80.1"
 
 # 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
@@ -20,7 +20,7 @@ name = "gen"
 description = "Code generation for proto"
 version = "0.1.0"
 edition = { workspace = true }
-rust-version = "1.80"
+rust-version = "1.80.1"
 authors = { workspace = true }
 homepage = { workspace = true }
 repository = { workspace = true }

diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml
@@ -26,7 +26,7 @@ repository = { workspace = true }
 license = { workspace = true }
 authors = { workspace = true }
 # Specify MSRV here as `cargo msrv` doesn't support workspace version
-rust-version = "1.80"
+rust-version = "1.80.1"
 
 [lints]
 workspace = true
@@ -42,9 +42,7 @@ object_store = { workspace = true }
 pbjson-types = "0.7"
 # TODO use workspace version
 prost = "0.13"
-# The MSRV of [email protected] is 1.80.1, which is higher than ours.
-# TODO: Update this version constraint when DataFusion updates its MSRV.
-substrait = { version = ">=0.49.0, <0.49.5", features = ["serde"] }
+substrait = { version = "0.49", features = ["serde"] }
 url = { workspace = true }
 
 [dev-dependencies]