Skip to content

Commit 6911e00

Browse files
findepiwiedld
authored andcommitted
Increase minimum supported Rust version (MSRV) to 1.80.1 (apache#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 (apache#13654)" This reverts commit c510ab4.
1 parent 598caff commit 6911e00

File tree

10 files changed

+12
-14
lines changed

10 files changed

+12
-14
lines changed

.github/workflows/rust.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,9 @@ jobs:
585585
#
586586
# To reproduce:
587587
# 1. Install the version of Rust that is failing. Example:
588-
# rustup install 1.80.0
588+
# rustup install 1.80.1
589589
# 2. Run the command that failed with that version. Example:
590-
# cargo +1.80.0 check -p datafusion
590+
# cargo +1.80.1 check -p datafusion
591591
#
592592
# To resolve, either:
593593
# 1. Change your code to use older Rust features,

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ homepage = "https://datafusion.apache.org"
6565
license = "Apache-2.0"
6666
readme = "README.md"
6767
repository = "https://github.com/apache/datafusion"
68-
rust-version = "1.80"
68+
rust-version = "1.80.1"
6969
version = "43.0.0"
7070

7171
[workspace.dependencies]

datafusion-cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ license = "Apache-2.0"
2626
homepage = "https://datafusion.apache.org"
2727
repository = "https://github.com/apache/datafusion"
2828
# Specify MSRV here as `cargo msrv` doesn't support workspace version
29-
rust-version = "1.80"
29+
rust-version = "1.80.1"
3030
readme = "README.md"
3131

3232
[dependencies]

datafusion/core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ authors = { workspace = true }
3030
# Specify MSRV here as `cargo msrv` doesn't support workspace version and fails with
3131
# "Unable to find key 'package.rust-version' (or 'package.metadata.msrv') in 'arrow-datafusion/Cargo.toml'"
3232
# https://github.com/foresterre/cargo-msrv/issues/590
33-
rust-version = "1.80"
33+
rust-version = "1.80.1"
3434

3535
[lints]
3636
workspace = true

datafusion/ffi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repository = { workspace = true }
2626
license = { workspace = true }
2727
authors = { workspace = true }
2828
# Specify MSRV here as `cargo msrv` doesn't support workspace version
29-
rust-version = "1.80"
29+
rust-version = "1.80.1"
3030

3131
[lints]
3232
workspace = true

datafusion/proto-common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ homepage = { workspace = true }
2626
repository = { workspace = true }
2727
license = { workspace = true }
2828
authors = { workspace = true }
29-
rust-version = "1.80"
29+
rust-version = "1.80.1"
3030

3131
# Exclude proto files so crates.io consumers don't need protoc
3232
exclude = ["*.proto"]

datafusion/proto-common/gen/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name = "gen-common"
2020
description = "Code generation for proto"
2121
version = "0.1.0"
2222
edition = { workspace = true }
23-
rust-version = "1.80"
23+
rust-version = "1.80.1"
2424
authors = { workspace = true }
2525
homepage = { workspace = true }
2626
repository = { workspace = true }

datafusion/proto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repository = { workspace = true }
2727
license = { workspace = true }
2828
authors = { workspace = true }
2929
# Specify MSRV here as `cargo msrv` doesn't support workspace version
30-
rust-version = "1.80"
30+
rust-version = "1.80.1"
3131

3232
# Exclude proto files so crates.io consumers don't need protoc
3333
exclude = ["*.proto"]

datafusion/proto/gen/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name = "gen"
2020
description = "Code generation for proto"
2121
version = "0.1.0"
2222
edition = { workspace = true }
23-
rust-version = "1.80"
23+
rust-version = "1.80.1"
2424
authors = { workspace = true }
2525
homepage = { workspace = true }
2626
repository = { workspace = true }

datafusion/substrait/Cargo.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repository = { workspace = true }
2626
license = { workspace = true }
2727
authors = { workspace = true }
2828
# Specify MSRV here as `cargo msrv` doesn't support workspace version
29-
rust-version = "1.80"
29+
rust-version = "1.80.1"
3030

3131
[lints]
3232
workspace = true
@@ -42,9 +42,7 @@ object_store = { workspace = true }
4242
pbjson-types = "0.7"
4343
# TODO use workspace version
4444
prost = "0.13"
45-
# The MSRV of [email protected] is 1.80.1, which is higher than ours.
46-
# TODO: Update this version constraint when DataFusion updates its MSRV.
47-
substrait = { version = ">=0.49.0, <0.49.5", features = ["serde"] }
45+
substrait = { version = "0.49", features = ["serde"] }
4846
url = { workspace = true }
4947

5048
[dev-dependencies]

0 commit comments

Comments
 (0)