This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new b020aba use 2021 edition (#1084)
b020aba is described below
commit b020aba079ae89366b1b6a2b0ed7e8409f99f0d9
Author: Jiayu Liu <[email protected]>
AuthorDate: Thu Oct 28 07:25:56 2021 +0800
use 2021 edition (#1084)
---
.env | 2 +-
.github/workflows/python_build.yml | 2 +-
.github/workflows/python_test.yaml | 4 ++--
.github/workflows/rust.yml | 6 +++++-
ballista-examples/Cargo.toml | 3 ++-
ballista/rust/client/Cargo.toml | 3 ++-
ballista/rust/scheduler/Cargo.toml | 2 +-
benchmarks/Cargo.toml | 3 ++-
ci/docker/linux-apt-lint.dockerfile | 2 +-
datafusion-cli/Cargo.toml | 4 ++--
datafusion-cli/Dockerfile | 2 +-
datafusion-examples/Cargo.toml | 3 ++-
datafusion/Cargo.toml | 3 ++-
datafusion/src/optimizer/filter_push_down.rs | 2 --
datafusion/src/physical_plan/expressions/not.rs | 1 -
python/Cargo.toml | 3 ++-
python/rust-toolchain | 2 +-
rustfmt.toml | 2 +-
18 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/.env b/.env
index d20df1a..d1e3c34 100644
--- a/.env
+++ b/.env
@@ -47,7 +47,7 @@ FEDORA=33
PYTHON=3.6
LLVM=11
CLANG_TOOLS=8
-RUST=nightly-2021-09-07
+RUST=nightly-2021-10-21
GO=1.15
NODE=14
MAVEN=3.5.4
diff --git a/.github/workflows/python_build.yml
b/.github/workflows/python_build.yml
index 74b61ae..c38e347 100644
--- a/.github/workflows/python_build.yml
+++ b/.github/workflows/python_build.yml
@@ -60,7 +60,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
- toolchain: nightly-2021-09-07
+ toolchain: nightly-2021-10-21
- name: Install dependencies
run: |
diff --git a/.github/workflows/python_test.yaml
b/.github/workflows/python_test.yaml
index 17e7abb..9cf6d56 100644
--- a/.github/workflows/python_test.yaml
+++ b/.github/workflows/python_test.yaml
@@ -25,8 +25,8 @@ jobs:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
run: |
- rustup toolchain install nightly-2021-09-07
- rustup default nightly-2021-09-07
+ rustup toolchain install nightly-2021-10-21
+ rustup default nightly-2021-10-21
rustup component add rustfmt
- name: Cache Cargo
uses: actions/cache@v2
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index aae84e6..14f231d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -147,6 +147,10 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
+ - name: Setup toolchain
+ run: |
+ rustup toolchain install stable
+ rustup default stable
- uses: actions/setup-python@v2
with:
python-version: "3.9"
@@ -283,7 +287,7 @@ jobs:
strategy:
matrix:
arch: [amd64]
- rust: [nightly-2021-09-07]
+ rust: [nightly-2021-10-21]
steps:
- uses: actions/checkout@v2
with:
diff --git a/ballista-examples/Cargo.toml b/ballista-examples/Cargo.toml
index 55a5916..6ff6b60 100644
--- a/ballista-examples/Cargo.toml
+++ b/ballista-examples/Cargo.toml
@@ -24,8 +24,9 @@ repository = "https://github.com/apache/arrow-datafusion";
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = [ "arrow", "distributed", "query", "sql" ]
-edition = "2018"
+edition = "2021"
publish = false
+rust-version = "1.56"
[dependencies]
arrow-flight = { version = "6.0.0" }
diff --git a/ballista/rust/client/Cargo.toml b/ballista/rust/client/Cargo.toml
index d381085..adac150 100644
--- a/ballista/rust/client/Cargo.toml
+++ b/ballista/rust/client/Cargo.toml
@@ -23,7 +23,8 @@ version = "0.6.0"
homepage = "https://github.com/apache/arrow-datafusion";
repository = "https://github.com/apache/arrow-datafusion";
authors = ["Apache Arrow <[email protected]>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
[dependencies]
ballista-core = { path = "../core", version = "0.6.0" }
diff --git a/ballista/rust/scheduler/Cargo.toml
b/ballista/rust/scheduler/Cargo.toml
index 10664f1..ac0d987 100644
--- a/ballista/rust/scheduler/Cargo.toml
+++ b/ballista/rust/scheduler/Cargo.toml
@@ -59,7 +59,7 @@ ballista-core = { path = "../core", version = "0.6.0" }
uuid = { version = "0.8", features = ["v4"] }
[build-dependencies]
-configure_me_codegen = "0.4.0"
+configure_me_codegen = "0.4.1"
tonic-build = { version = "0.5" }
[package.metadata.configure_me.bin]
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index ce882f6..6f6e51d 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -19,12 +19,13 @@
name = "arrow-benchmarks"
description = "Apache Arrow Benchmarks"
version = "4.0.0-SNAPSHOT"
-edition = "2018"
+edition = "2021"
authors = ["Apache Arrow <[email protected]>"]
homepage = "https://github.com/apache/arrow-datafusion";
repository = "https://github.com/apache/arrow-datafusion";
license = "Apache-2.0"
publish = false
+rust-version = "1.56"
[features]
simd = ["datafusion/simd"]
diff --git a/ci/docker/linux-apt-lint.dockerfile
b/ci/docker/linux-apt-lint.dockerfile
index de033d3..985f356 100644
--- a/ci/docker/linux-apt-lint.dockerfile
+++ b/ci/docker/linux-apt-lint.dockerfile
@@ -46,7 +46,7 @@ COPY ci/scripts/install_iwyu.sh /arrow/ci/scripts/
RUN arrow/ci/scripts/install_iwyu.sh /tmp/iwyu /usr/local ${clang_tools}
# Rust linter
-ARG rust=nightly-2021-09-07
+ARG rust=nightly-2021-10-21
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y
ENV PATH /root/.cargo/bin:$PATH
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
index 8b7ac19..b424f49 100644
--- a/datafusion-cli/Cargo.toml
+++ b/datafusion-cli/Cargo.toml
@@ -19,12 +19,12 @@
name = "datafusion-cli"
version = "5.1.0-SNAPSHOT"
authors = ["Apache Arrow <[email protected]>"]
-edition = "2018"
+edition = "2021"
keywords = [ "arrow", "datafusion", "ballista", "query", "sql", "cli", "repl" ]
license = "Apache-2.0"
homepage = "https://github.com/apache/arrow-datafusion";
repository = "https://github.com/apache/arrow-datafusion";
-
+rust-version = "1.56"
[dependencies]
clap = "2.33"
diff --git a/datafusion-cli/Dockerfile b/datafusion-cli/Dockerfile
index d24a55f..fe177b6 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.55 as builder
+FROM rust:1.56 as builder
COPY ./datafusion /usr/src/datafusion
diff --git a/datafusion-examples/Cargo.toml b/datafusion-examples/Cargo.toml
index 9f151f0..a087f57 100644
--- a/datafusion-examples/Cargo.toml
+++ b/datafusion-examples/Cargo.toml
@@ -24,8 +24,9 @@ repository = "https://github.com/apache/arrow-datafusion";
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = [ "arrow", "query", "sql" ]
-edition = "2018"
+edition = "2021"
publish = false
+rust-version = "1.56"
[[example]]
name = "avro_sql"
diff --git a/datafusion/Cargo.toml b/datafusion/Cargo.toml
index 6e8b521..e05bc07 100644
--- a/datafusion/Cargo.toml
+++ b/datafusion/Cargo.toml
@@ -30,7 +30,8 @@ include = [
"src/**/*.rs",
"Cargo.toml",
]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
[lib]
name = "datafusion"
diff --git a/datafusion/src/optimizer/filter_push_down.rs
b/datafusion/src/optimizer/filter_push_down.rs
index 84265cb..843d4e0 100644
--- a/datafusion/src/optimizer/filter_push_down.rs
+++ b/datafusion/src/optimizer/filter_push_down.rs
@@ -1172,8 +1172,6 @@ mod tests {
fn table_scan_with_pushdown_provider(
filter_support: TableProviderFilterPushDown,
) -> Result<LogicalPlan> {
- use std::convert::TryFrom;
-
let test_provider = PushDownProvider { filter_support };
let table_scan = LogicalPlan::TableScan {
diff --git a/datafusion/src/physical_plan/expressions/not.rs
b/datafusion/src/physical_plan/expressions/not.rs
index 341d38a..d94e78f 100644
--- a/datafusion/src/physical_plan/expressions/not.rs
+++ b/datafusion/src/physical_plan/expressions/not.rs
@@ -86,7 +86,6 @@ impl PhysicalExpr for NotExpr {
)))
}
ColumnarValue::Scalar(scalar) => {
- use std::convert::TryInto;
let bool_value: bool = scalar.try_into()?;
Ok(ColumnarValue::Scalar(ScalarValue::Boolean(Some(
!bool_value,
diff --git a/python/Cargo.toml b/python/Cargo.toml
index 731edcb..5e0ab8d 100644
--- a/python/Cargo.toml
+++ b/python/Cargo.toml
@@ -24,7 +24,8 @@ authors = ["Apache Arrow <[email protected]>"]
description = "Build and run queries against data"
readme = "README.md"
license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
[dependencies]
libc = "0.2"
diff --git a/python/rust-toolchain b/python/rust-toolchain
index 3e3dc5d..e7eda32 100644
--- a/python/rust-toolchain
+++ b/python/rust-toolchain
@@ -1 +1 @@
-nightly-2021-09-07
+nightly-2021-10-21
diff --git a/rustfmt.toml b/rustfmt.toml
index c49cccd..4522e52 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-edition = "2018"
+edition = "2021"
max_width = 90
# ignore generated files
