Skip to content

Commit b020aba

Browse files
authored
use 2021 edition (apache#1084)
1 parent 156ebff commit b020aba

File tree

18 files changed

+28
-21
lines changed

18 files changed

+28
-21
lines changed

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ FEDORA=33
4747
PYTHON=3.6
4848
LLVM=11
4949
CLANG_TOOLS=8
50-
RUST=nightly-2021-09-07
50+
RUST=nightly-2021-10-21
5151
GO=1.15
5252
NODE=14
5353
MAVEN=3.5.4

.github/workflows/python_build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
- uses: actions-rs/toolchain@v1
6262
with:
63-
toolchain: nightly-2021-09-07
63+
toolchain: nightly-2021-10-21
6464

6565
- name: Install dependencies
6666
run: |

.github/workflows/python_test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- uses: actions/checkout@v2
2626
- name: Setup Rust toolchain
2727
run: |
28-
rustup toolchain install nightly-2021-09-07
29-
rustup default nightly-2021-09-07
28+
rustup toolchain install nightly-2021-10-21
29+
rustup default nightly-2021-10-21
3030
rustup component add rustfmt
3131
- name: Cache Cargo
3232
uses: actions/cache@v2

.github/workflows/rust.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ jobs:
147147
- uses: actions/checkout@v2
148148
with:
149149
submodules: true
150+
- name: Setup toolchain
151+
run: |
152+
rustup toolchain install stable
153+
rustup default stable
150154
- uses: actions/setup-python@v2
151155
with:
152156
python-version: "3.9"
@@ -283,7 +287,7 @@ jobs:
283287
strategy:
284288
matrix:
285289
arch: [amd64]
286-
rust: [nightly-2021-09-07]
290+
rust: [nightly-2021-10-21]
287291
steps:
288292
- uses: actions/checkout@v2
289293
with:

ballista-examples/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ repository = "https://github.com/apache/arrow-datafusion"
2424
authors = ["Apache Arrow <[email protected]>"]
2525
license = "Apache-2.0"
2626
keywords = [ "arrow", "distributed", "query", "sql" ]
27-
edition = "2018"
27+
edition = "2021"
2828
publish = false
29+
rust-version = "1.56"
2930

3031
[dependencies]
3132
arrow-flight = { version = "6.0.0" }

ballista/rust/client/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ version = "0.6.0"
2323
homepage = "https://github.com/apache/arrow-datafusion"
2424
repository = "https://github.com/apache/arrow-datafusion"
2525
authors = ["Apache Arrow <[email protected]>"]
26-
edition = "2018"
26+
edition = "2021"
27+
rust-version = "1.56"
2728

2829
[dependencies]
2930
ballista-core = { path = "../core", version = "0.6.0" }

ballista/rust/scheduler/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ballista-core = { path = "../core", version = "0.6.0" }
5959
uuid = { version = "0.8", features = ["v4"] }
6060

6161
[build-dependencies]
62-
configure_me_codegen = "0.4.0"
62+
configure_me_codegen = "0.4.1"
6363
tonic-build = { version = "0.5" }
6464

6565
[package.metadata.configure_me.bin]

benchmarks/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
name = "arrow-benchmarks"
2020
description = "Apache Arrow Benchmarks"
2121
version = "4.0.0-SNAPSHOT"
22-
edition = "2018"
22+
edition = "2021"
2323
authors = ["Apache Arrow <[email protected]>"]
2424
homepage = "https://github.com/apache/arrow-datafusion"
2525
repository = "https://github.com/apache/arrow-datafusion"
2626
license = "Apache-2.0"
2727
publish = false
28+
rust-version = "1.56"
2829

2930
[features]
3031
simd = ["datafusion/simd"]

ci/docker/linux-apt-lint.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ COPY ci/scripts/install_iwyu.sh /arrow/ci/scripts/
4646
RUN arrow/ci/scripts/install_iwyu.sh /tmp/iwyu /usr/local ${clang_tools}
4747

4848
# Rust linter
49-
ARG rust=nightly-2021-09-07
49+
ARG rust=nightly-2021-10-21
5050
RUN curl https://sh.rustup.rs -sSf | \
5151
sh -s -- --default-toolchain stable -y
5252
ENV PATH /root/.cargo/bin:$PATH

datafusion-cli/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
name = "datafusion-cli"
2020
version = "5.1.0-SNAPSHOT"
2121
authors = ["Apache Arrow <[email protected]>"]
22-
edition = "2018"
22+
edition = "2021"
2323
keywords = [ "arrow", "datafusion", "ballista", "query", "sql", "cli", "repl" ]
2424
license = "Apache-2.0"
2525
homepage = "https://github.com/apache/arrow-datafusion"
2626
repository = "https://github.com/apache/arrow-datafusion"
27-
27+
rust-version = "1.56"
2828

2929
[dependencies]
3030
clap = "2.33"

datafusion-cli/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
FROM rust:1.55 as builder
18+
FROM rust:1.56 as builder
1919

2020
COPY ./datafusion /usr/src/datafusion
2121

datafusion-examples/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ repository = "https://github.com/apache/arrow-datafusion"
2424
authors = ["Apache Arrow <[email protected]>"]
2525
license = "Apache-2.0"
2626
keywords = [ "arrow", "query", "sql" ]
27-
edition = "2018"
27+
edition = "2021"
2828
publish = false
29+
rust-version = "1.56"
2930

3031
[[example]]
3132
name = "avro_sql"

datafusion/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ include = [
3030
"src/**/*.rs",
3131
"Cargo.toml",
3232
]
33-
edition = "2018"
33+
edition = "2021"
34+
rust-version = "1.56"
3435

3536
[lib]
3637
name = "datafusion"

datafusion/src/optimizer/filter_push_down.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1172,8 +1172,6 @@ mod tests {
11721172
fn table_scan_with_pushdown_provider(
11731173
filter_support: TableProviderFilterPushDown,
11741174
) -> Result<LogicalPlan> {
1175-
use std::convert::TryFrom;
1176-
11771175
let test_provider = PushDownProvider { filter_support };
11781176

11791177
let table_scan = LogicalPlan::TableScan {

datafusion/src/physical_plan/expressions/not.rs

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ impl PhysicalExpr for NotExpr {
8686
)))
8787
}
8888
ColumnarValue::Scalar(scalar) => {
89-
use std::convert::TryInto;
9089
let bool_value: bool = scalar.try_into()?;
9190
Ok(ColumnarValue::Scalar(ScalarValue::Boolean(Some(
9291
!bool_value,

python/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ authors = ["Apache Arrow <[email protected]>"]
2424
description = "Build and run queries against data"
2525
readme = "README.md"
2626
license = "Apache-2.0"
27-
edition = "2018"
27+
edition = "2021"
28+
rust-version = "1.56"
2829

2930
[dependencies]
3031
libc = "0.2"

python/rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2021-09-07
1+
nightly-2021-10-21

rustfmt.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
edition = "2018"
18+
edition = "2021"
1919
max_width = 90
2020

2121
# ignore generated files

0 commit comments

Comments
 (0)