Merge branch 'main' of https://github.com/rust-lang/rust-bindgen into upstream-roll-again

Author: adetaylor

.github/workflows/bindgen.yml

@@ -30,7 +30,7 @@ jobs:
         run: cargo fmt -- --check
 
       - name: Run clippy
-        run: cargo clippy --tests
+        run: cargo clippy --all-targets --workspace --exclude bindgen-integration --exclude tests_expectations
 
   msrv:
     runs-on: ubuntu-latest

.github/workflows/publish.yml

@@ -11,7 +11,7 @@ env:
 jobs:
   cargo-publish:
     runs-on: ubuntu-latest
-    if: ${{ (github.event.workflow_run.conclusion == 'success') && (github.event.workflow.name == 'Release') }}
+    if: ${{ !github.event.pull_request && (github.event.workflow_run.conclusion == 'success') && (github.event.workflow.name == 'Release') }}
     steps:
       - name: Print workflow event name
         run: echo "${{ github.event.workflow.name }}"

Cargo.toml

@@ -48,18 +48,42 @@ syn = "2.0"
 tempfile = "3"
 
 [workspace.lints.rust]
-# unused_qualifications = "warn"
+unused_qualifications = "warn"
 
 [workspace.lints.clippy]
-# disallowed-names = "allow"
-# manual-c-str-literals = "allow"
-# missing-safety-doc = "allow"
-# op-ref = "allow"
-# ptr-offset-with-cast = "allow"
-# too-many-arguments = "allow"
-# transmute-int-to-bool = "allow"
-# unnecessary-cast = "allow"
-# useless-transmute  = "allow"
+pedantic = { level = "warn", priority = -1 }
+
+cast_possible_truncation = "allow"
+cast_possible_wrap = "allow"
+cast_precision_loss = "allow"
+cast_sign_loss = "allow"
+default_trait_access = "allow"
+ignored_unit_patterns = "allow"
+implicit_hasher = "allow"
+items_after_statements = "allow"
+match_same_arms = "allow"
+maybe_infinite_iter = "allow"
+missing_errors_doc = "allow"
+missing_panics_doc = "allow"
+module_name_repetitions = "allow"
+must_use_candidate = "allow"
+redundant_closure_for_method_calls = "allow"
+return_self_not_must_use = "allow"
+similar_names = "allow"
+struct_excessive_bools = "allow"
+struct_field_names = "allow"
+unnecessary_wraps = "allow"
+unreadable_literal = "allow"
+used_underscore_binding = "allow"
+wildcard_imports = "allow"
+
+# TODO
+trivially_copy_pass_by_ref = "allow"
+unused_self = "allow"
+
+# Theese seem to be ok to ignore for now
+enum_glob_use = "allow"
+too_many_lines = "allow"
 
 # Config for 'cargo release'
 [workspace.metadata.release]

bindgen-tests/build.rs

@@ -1,6 +1,5 @@
 use std::char;
 use std::env;
-use std::ffi::OsStr;
 use std::fs::{self, File};
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -23,23 +22,19 @@ pub fn main() {
     println!("cargo:rerun-if-changed=tests/headers");
 
     for entry in entries {
-        match entry.path().extension().and_then(OsStr::to_str) {
-            Some("h") | Some("hpp") => {
-                let func = entry
-                    .file_name()
-                    .to_str()
-                    .unwrap()
-                    .replace(|c| !char::is_alphanumeric(c), "_")
-                    .replace("__", "_")
-                    .to_lowercase();
-                writeln!(
-                    dst,
-                    "test_header!(header_{func}, {:?});",
-                    entry.path(),
-                )
+        // TODO: file_is_cpp() in bindgen/lib.rs checks for hpp,hxx,hh, and h++ - should this be consistent?
+        if entry.path().extension().map_or(false, |ext| {
+            ext.eq_ignore_ascii_case("h") || ext.eq_ignore_ascii_case("hpp")
+        }) {
+            let func = entry
+                .file_name()
+                .to_str()
+                .unwrap()
+                .replace(|c| !char::is_alphanumeric(c), "_")
+                .replace("__", "_")
+                .to_lowercase();
+            writeln!(dst, "test_header!(header_{func}, {:?});", entry.path())
                 .unwrap();
-            }
-            _ => {}
         }
     }