From 1c3ecf9d672644d180e4265d42a66769798088bb Mon Sep 17 00:00:00 2001 From: manute Date: Mon, 13 Jun 2022 20:16:22 +0200 Subject: [PATCH 1/3] build: ci and codeowners --- .github/CODEOWNERS | 2 ++ .github/workflows/ci.yml | 73 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/ci.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..e14bb5c --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# unless otherwise specified, require review from one of these: +* @manute diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..73b16c8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,73 @@ +# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md + +name: CI - check, test and linting +on: + push: + branches: + - "**" + +jobs: + check: + name: Check + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + + - name: Run cargo check + uses: actions-rs/cargo@v1 + with: + command: check + + test: + name: Test Suite + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + + - name: Run cargo test + uses: actions-rs/cargo@v1 + with: + command: test + + lints: + name: Lints + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + components: rustfmt, clippy + + - name: Run cargo fmt + uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check + + - name: Run cargo clippy + uses: actions-rs/cargo@v1 + with: + command: clippy + args: -- -D warnings From b0a7e6ea334475f2e35d50529b7c9bdb0c7a2cf7 Mon Sep 17 00:00:00 2001 From: manute Date: Mon, 13 Jun 2022 20:17:12 +0200 Subject: [PATCH 2/3] build: workflow name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73b16c8..417175e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ # Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md -name: CI - check, test and linting +name: CI on: push: branches: From f8a3ed94b9554feec8202f1b361eb83b7be3a7c6 Mon Sep 17 00:00:00 2001 From: manute Date: Mon, 13 Jun 2022 20:25:24 +0200 Subject: [PATCH 3/3] lint: fix clippy wrong_self_convention --- src/lib.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 95ad4d1..bfdf14f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -111,14 +111,17 @@ impl Parser { } } + #[allow(clippy::wrong_self_convention)] fn is_starting_query(&mut self) -> bool { !self.name.is_empty() } + #[allow(clippy::wrong_self_convention)] fn is_finishing_query(&mut self, line: &str) -> bool { !self.query.is_empty() && line.ends_with(';') } + #[allow(clippy::wrong_self_convention)] fn is_tagged_name(&mut self, line: &str) -> bool { line.starts_with("--") && line.contains("name") }