Skip to content

Commit

Permalink
Fix: Honor linter rules in CI and locally (denoland#15492)
Browse files Browse the repository at this point in the history
RUSTFLAGS take precedence over `target.<triple>.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.
  • Loading branch information
mlafeldt committed Aug 19, 2022
1 parent 25a109d commit 1848c7e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' &&
Expand Down
2 changes: 1 addition & 1 deletion ext/flash/sendfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion tools/lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ async function clippy() {
}

const { success } = await Deno.spawn("cargo", {
args: cmd,
args: [...cmd, "--", "-D", "warnings"],
stdout: "inherit",
stderr: "inherit",
});
Expand Down

0 comments on commit 1848c7e

Please sign in to comment.