Merge pull request #700 from cgwalters/minor-local-buildstuff

build: Use workspace global lints

Author: jeckersb

.github/workflows/ci.yml

@@ -41,8 +41,6 @@ jobs:
         run: cd lib && cargo check --no-default-features
       - name: Individual checks
         run: (cd cli && cargo check) && (cd lib && cargo check)
-      - name: Lints
-        run: cargo xtask custom-lints
       - name: Run tests
         run: cargo test -- --nocapture --quiet
       - name: Manpage generation

Cargo.toml

@@ -47,3 +47,14 @@ exclude-crate-paths = [ { name = "libz-sys", exclude = "src/zlib" },
                         { name = "k8s-openapi", exclude = "src/v1_25" },
                         { name = "k8s-openapi", exclude = "src/v1_27" },
                       ]
+
+[workspace.lints.rust]
+# Require an extra opt-in for unsafe
+unsafe_code = "deny"
+# Absolutely must handle errors
+unused_must_use = "forbid"
+
+[workspace.lints.clippy]
+# These should only be in local code
+dbg_macro = "deny"
+todo = "deny"

cli/Cargo.toml

@@ -24,3 +24,6 @@ tokio = { workspace = true, features = ["macros"] }
 log = "0.4.21"
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+
+[lints]
+workspace = true

cli/src/main.rs

@@ -1,7 +1,3 @@
-// Good defaults
-#![forbid(unused_must_use)]
-#![deny(unsafe_code)]
-
 use anyhow::Result;
 
 async fn run() -> Result<()> {

lib/Cargo.toml

@@ -58,3 +58,5 @@ install = []
 # Implementation detail of man page generation.
 docgen = ["clap_mangen"]
 
+[lints]
+workspace = true

lib/src/lib.rs

@@ -7,11 +7,7 @@
 // See https://doc.rust-lang.org/rustc/lints/listing/allowed-by-default.html
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
-#![forbid(unused_must_use)]
-#![deny(unsafe_code)]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
-#![deny(clippy::dbg_macro)]
-#![deny(clippy::todo)]
 // These two are in my experience the lints which are most likely
 // to trigger, and among the least valuable to fix.
 #![allow(clippy::needless_borrow)]

tests-integration/Cargo.toml

@@ -24,3 +24,6 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tempfile = { workspace = true }
 xshell = { version = "0.2.6" }
+
+[lints]
+workspace = true

xtask/Cargo.toml

@@ -19,3 +19,6 @@ fn-error-context = { workspace = true }
 tempfile = { workspace = true }
 mandown = "0.1.3"
 xshell = { version = "0.2.6" }
+
+[lints]
+workspace = true

xtask/src/xtask.rs

@@ -1,5 +1,5 @@
 use std::fs::File;
-use std::io::{BufRead, BufReader, BufWriter, Cursor, Write};
+use std::io::{BufRead, BufReader, BufWriter, Write};
 use std::process::{Command, Stdio};
 
 use anyhow::{anyhow, Context, Result};
@@ -23,7 +23,6 @@ const TASKS: &[(&str, fn(&Shell) -> Result<()>)] = &[
     ("package", package),
     ("package-srpm", package_srpm),
     ("spec", spec),
-    ("custom-lints", custom_lints),
     ("test-tmt", test_tmt),
 ];
 
@@ -356,18 +355,6 @@ fn package_srpm(sh: &Shell) -> Result<()> {
     Ok(())
 }
 
-fn custom_lints(sh: &Shell) -> Result<()> {
-    // Verify there are no invocations of the dbg macro.
-    let o = cmd!(sh, "git grep dbg\x21 *.rs").ignore_status().read()?;
-    if !o.is_empty() {
-        let mut stderr = std::io::stderr().lock();
-        std::io::copy(&mut Cursor::new(o.as_bytes()), &mut stderr)?;
-        eprintln!();
-        anyhow::bail!("Found dbg\x21 macro");
-    }
-    Ok(())
-}
-
 fn print_help(_sh: &Shell) -> Result<()> {
     println!("Tasks:");
     for (name, _) in TASKS {