Skip to content

Commit 0f655be

Browse files
Jefffreyaskalt
authored andcommitted
Use workspace rust-version for all workspace crates (apache#14009)
1 parent 441f0c6 commit 0f655be

File tree

8 files changed

+57
-13
lines changed

8 files changed

+57
-13
lines changed

datafusion-cli/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ keywords = ["arrow", "datafusion", "query", "sql"]
2525
license = "Apache-2.0"
2626
homepage = "https://datafusion.apache.org"
2727
repository = "https://github.com/apache/datafusion"
28-
# Specify MSRV here as `cargo msrv` doesn't support workspace version
29-
rust-version = "1.76"
28+
rust-version = "1.80.1"
3029
readme = "README.md"
3130

3231
[dependencies]

datafusion/core/Cargo.toml

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ homepage = { workspace = true }
2727
repository = { workspace = true }
2828
license = { workspace = true }
2929
authors = { workspace = true }
30-
# Specify MSRV here as `cargo msrv` doesn't support workspace version and fails with
31-
# "Unable to find key 'package.rust-version' (or 'package.metadata.msrv') in 'arrow-datafusion/Cargo.toml'"
32-
# https://github.com/foresterre/cargo-msrv/issues/590
33-
rust-version = "1.76"
30+
rust-version = { workspace = true }
3431

3532
[lints]
3633
workspace = true

datafusion/ffi/Cargo.toml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
[package]
19+
name = "datafusion-ffi"
20+
description = "Foreign Function Interface implementation for DataFusion"
21+
readme = "README.md"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
homepage = { workspace = true }
25+
repository = { workspace = true }
26+
license = { workspace = true }
27+
authors = { workspace = true }
28+
rust-version = { workspace = true }
29+
30+
[lints]
31+
workspace = true
32+
33+
[lib]
34+
name = "datafusion_ffi"
35+
path = "src/lib.rs"
36+
37+
[dependencies]
38+
abi_stable = "0.11.3"
39+
arrow = { workspace = true, features = ["ffi"] }
40+
async-ffi = { version = "0.5.0", features = ["abi_stable"] }
41+
async-trait = { workspace = true }
42+
datafusion = { workspace = true, default-features = false }
43+
datafusion-proto = { workspace = true }
44+
futures = { workspace = true }
45+
log = { workspace = true }
46+
prost = { workspace = true }
47+
48+
[dev-dependencies]
49+
doc-comment = { workspace = true }
50+
tokio = { 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.76"
29+
rust-version = { workspace = true }
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.76"
23+
rust-version = { workspace = true }
2424
authors = { workspace = true }
2525
homepage = { workspace = true }
2626
repository = { workspace = true }

datafusion/proto/Cargo.toml

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

3231
# Exclude proto files so crates.io consumers don't need protoc
3332
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.76"
23+
rust-version = { workspace = true }
2424
authors = { workspace = true }
2525
homepage = { workspace = true }
2626
repository = { workspace = true }

datafusion/substrait/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ homepage = { workspace = true }
2525
repository = { workspace = true }
2626
license = { workspace = true }
2727
authors = { workspace = true }
28-
# Specify MSRV here as `cargo msrv` doesn't support workspace version
29-
rust-version = "1.76"
28+
rust-version = { workspace = true }
3029

3130
[lints]
3231
workspace = true

0 commit comments

Comments
 (0)