From 1848c7e361f1a3a33487b60ab6fcb61ed1f62273 Mon Sep 17 00:00:00 2001 From: Mathias Lafeldt Date: Fri, 19 Aug 2022 14:17:18 +0200 Subject: Fix: Honor linter rules in CI and locally (#15492) RUSTFLAGS take precedence over `target..rustflags`. Therefore, setting the env var globally in CI would always override whatever linter rules are allowed or denied in .cargo/config.toml. With this change, we ensure that problems are detected both in CI and locally, using either cargo clippy or lint.js. --- .github/workflows/ci.yml | 3 --- ext/flash/sendfile.rs | 2 +- tools/lint.js | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36656d7c6..2da07b31f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,9 +140,6 @@ jobs: service_account_key: ${{ secrets.GCP_SA_KEY }} export_default_credentials: true - - name: Error on warning - run: echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV - - name: Configure canary build if: | matrix.job == 'test' && diff --git a/ext/flash/sendfile.rs b/ext/flash/sendfile.rs index 4efa7bc35..4caea712d 100644 --- a/ext/flash/sendfile.rs +++ b/ext/flash/sendfile.rs @@ -21,8 +21,8 @@ impl SendFile { let count = 0x7ffff000; let mut offset = self.written as libc::off_t; - // SAFETY: call to libc::sendfile() let res = + // SAFETY: call to libc::sendfile() unsafe { libc::sendfile(self.io.1, self.io.0, &mut offset, count) }; if res == -1 { Err(io::Error::last_os_error()) diff --git a/tools/lint.js b/tools/lint.js index c1b9b3050..21433fc6c 100755 --- a/tools/lint.js +++ b/tools/lint.js @@ -111,7 +111,7 @@ async function clippy() { } const { success } = await Deno.spawn("cargo", { - args: cmd, + args: [...cmd, "--", "-D", "warnings"], stdout: "inherit", stderr: "inherit", }); -- cgit v1.2.3