From 2c935f25dd073c8edbda03eb67e242da6c4eeefb Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Tue, 11 May 2021 14:08:31 +0200 Subject: [PATCH] Update to rust 1.52 Signed-off-by: Heinz N. Gies --- .github/workflows/tests.yaml | 4 ++-- Dockerfile | 2 +- Dockerfile.learn | 2 +- rust-toolchain | 2 +- src/lib.rs | 4 ++-- tremor-pipeline/src/lib.rs | 4 ++-- tremor-script/src/lib.rs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index fb9e17e580..4017b46cb1 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -45,8 +45,8 @@ jobs: PROPTEST_CASES: 2500 RUSTFLAGS: -D warnings -C target-feature=+avx,+avx2,+sse4.2 with: - version: "0.16.0" - args: " --exclude-files target* tremor-cli tremor-api deprecated **/errors.rs --out Lcov --all" + version: "0.18.0-alpha3" + args: " --avoid-cfg-tarpaulin --exclude-files target* tremor-cli tremor-api **/errors.rs --out Lcov --all" - name: Coveralls uses: coverallsapp/github-action@master with: diff --git a/Dockerfile b/Dockerfile index 4d5b4bc246..c73e3cf15c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.50.0 as builder +FROM rust:1.52.1 as builder # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile.learn b/Dockerfile.learn index 7367d4e11a..2690351af7 100644 --- a/Dockerfile.learn +++ b/Dockerfile.learn @@ -1,4 +1,4 @@ -FROM rust:1.50.0 as builder +FROM rust:1.52.1 as builder RUN cargo install --features=ssl websocat diff --git a/rust-toolchain b/rust-toolchain index ba0a719118..154cb93b2c 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.51.0 +1.52.1 diff --git a/src/lib.rs b/src/lib.rs index 8e725e9a36..f533dd46f9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,10 +23,10 @@ clippy::unnecessary_unwrap, clippy::pedantic )] -// TODOthis is needed due to a false positive in clippy +// TODO this is needed due to a false positive in clippy // https://github.com/rust-lang/rust/issues/83125 // we will need this in 1.52.0 -// #![allow(proc_macro_back_compat)] +#![allow(proc_macro_back_compat)] #[macro_use] extern crate serde_derive; diff --git a/tremor-pipeline/src/lib.rs b/tremor-pipeline/src/lib.rs index 4e22d21dfe..d377abbb72 100644 --- a/tremor-pipeline/src/lib.rs +++ b/tremor-pipeline/src/lib.rs @@ -23,10 +23,10 @@ clippy::unnecessary_unwrap, clippy::pedantic )] -// TODOthis is needed due to a false positive in clippy +// TODO this is needed due to a false positive in clippy // https://github.com/rust-lang/rust/issues/83125 // we will need this in 1.52.0 -// #![allow(proc_macro_back_compat)] +#![allow(proc_macro_back_compat)] #[macro_use] extern crate serde_derive; diff --git a/tremor-script/src/lib.rs b/tremor-script/src/lib.rs index bf7d081684..55c6dfbe0f 100644 --- a/tremor-script/src/lib.rs +++ b/tremor-script/src/lib.rs @@ -25,7 +25,7 @@ // TODO this is needed due to a false positive in clippy // https://github.com/rust-lang/rust/issues/83125 // we will need this in 1.52.0 -// #![allow(proc_macro_back_compat)] +#![allow(proc_macro_back_compat)] /// The Tremor Script AST pub mod ast;