Revise generate function to return Result

Cargo.toml

@@ -151,15 +151,21 @@ members = [
 unused_qualifications = "allow"
 
 [lints.clippy]
-missing_safety_doc = "allow"
+# Enable pedantic lints - use this manually once in a while, but don't enable by default
+# pedantic = { level = "warn", priority = -1 }
 
-# FIXME(clippy): all these are default lints and should probably be fixed
-identity_op = "allow"
-if_same_then_else = "allow"
-non_minimal_cfg = "allow"
-precedence = "allow"
-redundant_field_names = "allow"
-redundant_static_lifetimes = "allow"
-unnecessary_cast = "allow"
-unused_unit = "allow"
-zero_ptr = "allow"
+# We are okay with the current state of these lints
+explicit_iter_loop = "warn"
+identity_op = "allow"  # some expressions like `0 | x` are clearer for bit ops
+manual_assert = "warn"
+map_unwrap_or = "warn"
+missing_safety_doc = "allow"  # safety? in libc? seriously?
+non_minimal_cfg = "allow"  # for some reason cfg_if! sometimes trigger this
+ptr_as_ptr = "warn"
+unnecessary_semicolon = "warn"
+
+# FIXME(clippy): these should be fixed if possible
+expl_impl_clone_on_copy = "allow"
+uninlined_format_args = "allow"
+unnecessary_cast = "allow"  # some casts like `as usize` are only needed for some targets
+used_underscore_binding = "allow"

build.rs

@@ -4,7 +4,7 @@ use std::{env, str};
 // List of cfgs this build script is allowed to set. The list is needed to support check-cfg, as we
 // need to know all the possible cfgs that this script will set. If you need to set another cfg
 // make sure to add it to this list as well.
-const ALLOWED_CFGS: &'static [&'static str] = &[
+const ALLOWED_CFGS: &[&str] = &[
     "emscripten_old_stat_abi",
     "espidf_time32",
     "freebsd10",
@@ -24,7 +24,7 @@ const ALLOWED_CFGS: &'static [&'static str] = &[
 ];
 
 // Extra values to allow for check-cfg.
-const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
+const CHECK_CFG_EXTRA: &[(&str, &[&str])] = &[
     (
         "target_os",
         &[
@@ -46,7 +46,6 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
     let (rustc_minor_ver, _is_nightly) = rustc_minor_nightly();
-    let rustc_dep_of_std = env::var("CARGO_FEATURE_RUSTC_DEP_OF_STD").is_ok();
     let libc_ci = env::var("LIBC_CI").is_ok();
     let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
     let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
@@ -66,10 +65,8 @@ fn main() {
         vers
     } else if libc_ci {
         which_freebsd().unwrap_or(12)
-    } else if rustc_dep_of_std {
-        12
     } else {
-        12
+        12 // regardless of CARGO_FEATURE_RUSTC_DEP_OF_STD env var
     };
 
     match which_freebsd {
@@ -163,12 +160,11 @@ fn rustc_version_cmd(is_clippy_driver: bool) -> Output {
 
     let output = cmd.output().expect("Failed to get rustc version");
 
-    if !output.status.success() {
-        panic!(
-            "failed to run rustc: {}",
-            String::from_utf8_lossy(output.stderr.as_slice())
-        );
-    }
+    assert!(
+        output.status.success(),
+        "failed to run rustc: {}",
+        String::from_utf8_lossy(output.stderr.as_slice())
+    );
 
     output
 }
@@ -195,9 +191,11 @@ fn rustc_minor_nightly() -> (u32, bool) {
 
     let mut pieces = version.split('.');
 
-    if pieces.next() != Some("rustc 1") {
-        panic!("Failed to get rustc version");
-    }
+    assert_eq!(
+        pieces.next(),
+        Some("rustc 1"),
+        "Failed to get rustc version"
+    );
 
     let minor = pieces.next();
 
@@ -207,9 +205,9 @@ fn rustc_minor_nightly() -> (u32, bool) {
     // since a nightly build should either come from CI
     // or a git checkout
     let nightly_raw = otry!(pieces.next()).split('-').nth(1);
-    let nightly = nightly_raw
-        .map(|raw| raw.starts_with("dev") || raw.starts_with("nightly"))
-        .unwrap_or(false);
+    let nightly = nightly_raw.map_or(false, |raw| {
+        raw.starts_with("dev") || raw.starts_with("nightly")
+    });
     let minor = otry!(otry!(minor).parse().ok());
 
     (minor, nightly)
@@ -235,7 +233,13 @@ fn which_freebsd() -> Option<i32> {
 }
 
 fn emcc_version_code() -> Option<u64> {
-    let output = Command::new("emcc").arg("-dumpversion").output().ok()?;
+    let emcc = if cfg!(target_os = "windows") {
+        "emcc.bat"
+    } else {
+        "emcc"
+    };
+
+    let output = Command::new(emcc).arg("-dumpversion").output().ok()?;
     if !output.status.success() {
         return None;
     }
@@ -254,8 +258,9 @@ fn emcc_version_code() -> Option<u64> {
 }
 
 fn set_cfg(cfg: &str) {
-    if !ALLOWED_CFGS.contains(&cfg) {
-        panic!("trying to set cfg {cfg}, but it is not in ALLOWED_CFGS");
-    }
+    assert!(
+        ALLOWED_CFGS.contains(&cfg),
+        "trying to set cfg {cfg}, but it is not in ALLOWED_CFGS",
+    );
     println!("cargo:rustc-cfg={cfg}");
 }

ctest-test/Cargo.toml

@@ -9,6 +9,9 @@ edition = "2021"
 ctest = { path = "../ctest" }
 cc = "1.0"
 
+[dev-dependencies]
+ctest = { path = "../ctest" }
+
 [dependencies]
 cfg-if = "1.0.0"
 libc = { path = ".." }
@@ -37,6 +40,3 @@ test = false
 unused_qualifications = "allow"
 
 [lints.clippy]
-# FIXME(clippy): fix these
-match_like_matches_macro = "allow"
-eq_op = "allow"

ctest-test/build.rs

@@ -38,6 +38,7 @@ fn main() {
         .array_arg(t1_arrays)
         .skip_roundtrip(|n| n == "Arr")
         .generate("src/t1.rs", "t1gen.rs");
+
     ctest::TestGenerator::new()
         .header("t2.h")
         .include("src")
@@ -72,6 +73,7 @@ fn main() {
             .array_arg(t1_arrays)
             .skip_roundtrip(|n| n == "Arr")
             .generate("src/t1.rs", "t1gen_cxx.rs");
+
         ctest::TestGenerator::new()
             .header("t2.h")
             .language(ctest::Lang::CXX)
@@ -103,8 +105,5 @@ fn t1_volatile(i: ctest::VolatileItemKind) -> bool {
 }
 
 fn t1_arrays(n: &str, i: usize) -> bool {
-    match n {
-        "T1r" | "T1s" | "T1t" | "T1v" if i == 0 => true,
-        _ => false,
-    }
+    i == 0 && matches!(n, "T1r" | "T1s" | "T1t" | "T1v")
 }

ctest-test/src/lib.rs

@@ -1,2 +1,5 @@
+// src/** is mostly dummy files
+#![allow(clippy::style, clippy::correctness)]
+
 pub mod t1;
 pub mod t2;

ctest-test/tests/all.rs

@@ -128,3 +128,73 @@ fn t2_cxx() {
         panic!();
     }
 }
+
+#[test]
+fn test_missing_out_dir() {
+    // Save original OUT_DIR
+    let orig_out_dir = env::var_os("OUT_DIR");
+    env::remove_var("OUT_DIR");
+
+    // Test error handling for OUT_DIR missing
+    let result = ctest::TestGenerator::new()
+        .header("t1.h")
+        .try_generate("src/t1.rs", "out_dir_gen.rs");
+
+    // Restore OUT_DIR
+    if let Some(dir) = orig_out_dir {
+        env::set_var("OUT_DIR", dir);
+    }
+
+    assert!(result.is_err(), "Expected error when OUT_DIR is missing");
+}
+
+#[test]
+fn test_invalid_output_path() {
+    // Test error handling for invalid output path
+    let err = ctest::TestGenerator::new()
+        .header("t1.h")
+        .include("src")
+        .out_dir("/nonexistent_dir") // Should fail with permission error
+        .try_generate("src/t1.rs", "out_path_gen.rs");
+
+    assert!(err.is_err(), "Expected error with invalid output path");
+}
+
+#[test]
+fn test_parsing_error() {
+    // Test parsing error
+    // Create a temporary file with invalid Rust syntax
+    let temp_dir = env::temp_dir();
+    let invalid_file = temp_dir.join("invalid.rs");
+    std::fs::write(&invalid_file, "fn invalid_syntax {").unwrap();
+
+    let err = ctest::TestGenerator::new()
+        .header("t1.h")
+        .include("src")
+        .try_generate(&invalid_file, "parse_gen.rs");
+
+    assert!(err.is_err(), "Expected error when parsing invalid syntax");
+    let _ = std::fs::remove_file(invalid_file);
+}
+
+#[test]
+fn test_non_existent_header() {
+    // Test non-existent header
+    let err = ctest::TestGenerator::new()
+        .header("nonexistent_header.h")
+        .include("src")
+        .try_generate("src/t1.rs", "missing_header_gen.rs");
+
+    assert!(err.is_err(), "Expected error with non-existent header");
+}
+
+#[test]
+fn test_invalid_include_path() {
+    // Test invalid include path
+    let err = ctest::TestGenerator::new()
+        .header("t1.h")
+        .include("nonexistent_directory")
+        .try_generate("src/t1.rs", "invalid_include_gen.rs");
+
+    assert!(err.is_err(), "Expected error with invalid include path");
+}

ctest/Cargo.toml

@@ -9,6 +9,7 @@ repository = "https://github.com/rust-lang/libc"
 rust-version = "1.63.0"
 
 [dependencies]
+anyhow = "1.0"
 garando_syntax = "0.1"
 cc = "1.0.1"
 rustc_version = "0.4"