From 29f0f5ce510495e3b117acb14929544f66761819 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Thu, 17 Oct 2024 16:10:14 +0200 Subject: [PATCH 1/2] Increase minimum supported Rust version (MSRV) to 1.80 Current goal is to support four last stable versions or versions for 4 months whichever is lower. Given 1.80.0 was released on: 25 July, 2024 it's over 4 months old and 1.79 does not need to be supported. --- Cargo.toml | 2 +- datafusion-cli/Cargo.toml | 2 +- datafusion/core/Cargo.toml | 2 +- datafusion/ffi/Cargo.toml | 2 +- datafusion/proto-common/Cargo.toml | 2 +- datafusion/proto-common/gen/Cargo.toml | 2 +- datafusion/proto/Cargo.toml | 2 +- datafusion/proto/gen/Cargo.toml | 2 +- datafusion/substrait/Cargo.toml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76bc50d59a088..7ac6c8d82e17e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ homepage = "https://datafusion.apache.org" license = "Apache-2.0" readme = "README.md" repository = "https://github.com/apache/datafusion" -rust-version = "1.79" +rust-version = "1.80" version = "43.0.0" [workspace.dependencies] diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml index 784d47220c7c9..8ba49e4c82f2a 100644 --- 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.79" +rust-version = "1.80" readme = "README.md" [dependencies] diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index 268e0fb17f7b4..52c46b25e66fe 100644 --- 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.79" +rust-version = "1.80" [lints] workspace = true diff --git a/datafusion/ffi/Cargo.toml b/datafusion/ffi/Cargo.toml index 119747342515d..6393fb31e3206 100644 --- 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.76" +rust-version = "1.80" [lints] workspace = true diff --git a/datafusion/proto-common/Cargo.toml b/datafusion/proto-common/Cargo.toml index 6c53e1b1ced0c..0aacc6d9938cf 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.79" +rust-version = "1.80" # 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 6e5783f467a70..29f238903f40a 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.79" +rust-version = "1.80" authors = { workspace = true } homepage = { workspace = true } repository = { workspace = true } diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml index 9e4b331a01bfa..da28cad93ab68 100644 --- 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.79" +rust-version = "1.80" # 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 aee8fac4a1209..dc728489523de 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.79" +rust-version = "1.80" authors = { workspace = true } homepage = { workspace = true } repository = { workspace = true } diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml index 79e5a3206cad7..42fd8f9f24abb 100644 --- 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.79" +rust-version = "1.80" [lints] workspace = true From 5bdc2fa0c2f6ed1022d97dddc00387a3294d2123 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Tue, 3 Dec 2024 09:42:07 +0100 Subject: [PATCH 2/2] update dockerfile and workflow comment --- .github/workflows/rust.yml | 4 ++-- datafusion-cli/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 50bebc5b40947..afc9c05864073 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -582,9 +582,9 @@ jobs: # # To reproduce: # 1. Install the version of Rust that is failing. Example: - # rustup install 1.79.0 + # rustup install 1.80.0 # 2. Run the command that failed with that version. Example: - # cargo +1.79.0 check -p datafusion + # cargo +1.80.0 check -p datafusion # # To resolve, either: # 1. Change your code to use older Rust features, diff --git a/datafusion-cli/Dockerfile b/datafusion-cli/Dockerfile index 79c24f6baf3ef..faf345660dbea 100644 --- a/datafusion-cli/Dockerfile +++ b/datafusion-cli/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM rust:1.79-bookworm AS builder +FROM rust:1.80-bookworm AS builder COPY . /usr/src/datafusion COPY ./datafusion /usr/src/datafusion/datafusion