From e562c2fc2b408863509e270bc3872e40c97a63ac Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Mon, 8 Aug 2022 13:32:58 +0200 Subject: [PATCH] chore: Update CI to assume github actions --- .github/workflows/rust.yml | 11 +++++++++++ Cargo.lock | 2 -- ci.sh | 31 +++++++++++-------------------- src/parser/range.rs | 1 - 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 60147b91..7ddfae12 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -32,5 +32,16 @@ jobs: - name: Build run: cargo build + - name: Check 1.40 + if: ${{ matrix.rust == '1.40.0' }} + run: | + cargo "$@" check --all-features + cargo "$@" check --no-default-features + - name: Run tests + if: ${{ matrix.rust != '1.40.0' }} run: ./ci.sh + + - name: Check docs + if: ${{ matrix.rust == 'stable' }} + run: cargo doc diff --git a/Cargo.lock b/Cargo.lock index b23775ef..5da565b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "aho-corasick" version = "0.7.18" diff --git a/ci.sh b/ci.sh index 63973194..c8502634 100755 --- a/ci.sh +++ b/ci.sh @@ -1,27 +1,18 @@ #!/bin/bash -x set -ex -if [[ "$TRAVIS_RUST_VERSION" == "1.40.0" ]]; then - cargo "$@" check - cargo "$@" check --no-default-features -else - cargo "$@" build - cargo "$@" test --all-features - cargo "$@" test --all-features --examples +cargo "$@" build +cargo "$@" test --all-features +cargo "$@" test --all-features --examples - cargo "$@" test --bench json --bench http -- --test - cargo "$@" check --bench mp4 --features mp4 - - cargo "$@" build --no-default-features --features alloc - cargo "$@" test --no-default-features --features alloc --examples +cargo "$@" test --bench json --bench http -- --test +cargo "$@" check --bench mp4 --features mp4 - cargo "$@" build --no-default-features - cargo "$@" test --no-default-features --examples +cargo "$@" build --no-default-features --features alloc +cargo "$@" test --no-default-features --features alloc --examples - cargo "$@" check --no-default-features --features tokio-02 - cargo "$@" check --no-default-features --features tokio-03 -fi +cargo "$@" build --no-default-features +cargo "$@" test --no-default-features --examples -if [[ "$TRAVIS_RUST_VERSION" == "stable" ]]; then - cargo doc -fi +cargo "$@" check --no-default-features --features tokio-02 +cargo "$@" check --no-default-features --features tokio-03 diff --git a/src/parser/range.rs b/src/parser/range.rs index 7b53fe64..46353eb2 100644 --- a/src/parser/range.rs +++ b/src/parser/range.rs @@ -85,7 +85,6 @@ parser! { /// assert!(parser.parse("!").is_err()); /// # } /// ``` - #[inline] pub fn recognize[Input, P](parser: P)(Input) -> ::Range where [ P: Parser,