diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 00a7eef..f353041 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -12,23 +12,18 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true + - uses: dtolnay/rust-toolchain@nightly - run: bash ./auxiliary/update_cargo-readme.sh - run: bash ./auxiliary/check_readme_consistency.sh style: name: Style Checks (stable/ubuntu-latest) runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - uses: hecrj/setup-rust-action@v1 + - uses: actions/checkout@v1 + - uses: dtolnay/rust-toolchain@nightly with: components: "rustfmt,clippy" - - uses: actions/checkout@v1 - name: Check code formatting run: cargo fmt --all -- --check - name: Check Clippy lints @@ -39,14 +34,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - rust_release: [nightly, stable] + rust_release: [1.45, stable, nightly] os: [ubuntu-latest, windows-latest, macOS-latest] steps: - - uses: actions/checkout@master - - uses: hecrj/setup-rust-action@v1 + - uses: actions/checkout@v1 + - uses: dtolnay/rust-toolchain@master with: - rust-version: ${{ matrix.rust_release }} + toolchain: ${{ matrix.rust_release }} - name: Build run: cargo build --verbose @@ -71,11 +66,5 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true - - uses: actions-rs/cargo@v1 - with: - command: test - args: --package influxdb --package influxdb_derive --all-features --no-fail-fast \ No newline at end of file + - uses: dtolnay/rust-toolchain@nightly + - run: cargo test --package influxdb --package influxdb_derive --all-features --no-fail-fast diff --git a/README.md b/README.md index 4c2c669..73c3ace 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Build with Rust - - Minimum Rust Version + + Minimum Rust Version

diff --git a/README.tpl b/README.tpl index 950b79b..e0160b3 100644 --- a/README.tpl +++ b/README.tpl @@ -22,8 +22,8 @@ Build with Rust - - Minimum Rust Version + + Minimum Rust Version

diff --git a/influxdb_derive/src/lib.rs b/influxdb_derive/src/lib.rs index 2bfe464..6c4b02d 100644 --- a/influxdb_derive/src/lib.rs +++ b/influxdb_derive/src/lib.rs @@ -1,5 +1,3 @@ -extern crate proc_macro; - use proc_macro::TokenStream; use proc_macro2::TokenStream as TokenStream2; use quote::quote;