Add option to suppress windows-bindgen comment in generated code (#…

…2910)

crates/libs/bindgen/src/rust/mod.rs

@@ -32,6 +32,7 @@ pub fn from_reader(reader: &'static metadata::Reader, mut config: std::collectio
     writer.implement = config.remove("implement").is_some();
     writer.minimal = config.remove("minimal").is_some();
     writer.no_inner_attributes = config.remove("no-inner-attributes").is_some();
+    writer.no_bindgen_comment = config.remove("no-bindgen-comment").is_some();
     writer.vtbl = config.remove("vtbl").is_some();
 
     if writer.package && writer.flatten {

crates/libs/bindgen/src/rust/try_format.rs

@@ -1,7 +1,7 @@
 use std::io::Write;
 
 pub fn try_format(writer: &super::Writer, tokens: &str) -> String {
-    let preamble = if writer.package {
+    let preamble = if writer.no_bindgen_comment {
         String::new()
     } else {
         let name = std::env!("CARGO_PKG_NAME");

crates/libs/bindgen/src/rust/writer.rs

@@ -19,6 +19,7 @@ pub struct Writer {
     pub package: bool,             // default is single file with no cfg - implies !flatten
     pub minimal: bool,             // strips out enumerators - in future possibly other helpers as well
     pub no_inner_attributes: bool, // skips the inner attributes at the start of the file
+    pub no_bindgen_comment: bool,  // skips the bindgen comment at the start of the file
     pub vtbl: bool,                // include minimal vtbl layout support for interfaces
     pub prepend: std::collections::HashMap<metadata::TypeDef, String>,
 }
@@ -36,6 +37,7 @@ impl Writer {
             package: false,
             minimal: false,
             no_inner_attributes: false,
+            no_bindgen_comment: false,
             vtbl: false,
             prepend: Default::default(),
         }

crates/libs/core/src/imp/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(non_snake_case, non_upper_case_globals, non_camel_case_types, dead_code, clippy::all)]
 ::windows_targets::link!("api-ms-win-core-winrt-l1-1-0.dll" "system" fn RoGetActivationFactory(activatableclassid : * mut core::ffi::c_void, iid : *const GUID, factory : *mut *mut core::ffi::c_void) -> HRESULT);
 ::windows_targets::link!("kernel32.dll" "system" fn CloseHandle(hobject : HANDLE) -> BOOL);

crates/libs/core/src/imp/com_bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(non_snake_case, non_upper_case_globals, non_camel_case_types, dead_code, clippy::all)]
 #[inline]
 pub unsafe fn CoCreateGuid() -> windows_core::Result<windows_core::GUID> {

crates/libs/metadata/src/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(non_snake_case, non_upper_case_globals, non_camel_case_types, dead_code, clippy::all)]
 pub type CorElementType = u8;
 pub const ELEMENT_TYPE_ARRAY: CorElementType = 20u8;

crates/libs/registry/src/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/libs/registry/tests/bindings.txt

@@ -1,5 +1,5 @@
 --out src/bindings.rs
---config flatten sys minimal
+--config flatten sys minimal no-bindgen-comment
 
 --filter
     Windows.Win32.Foundation.ERROR_INVALID_DATA

crates/libs/result/src/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/libs/result/tests/bindings.txt

@@ -1,5 +1,5 @@
 --out src/bindings.rs
---config flatten sys minimal vtbl
+--config flatten sys minimal vtbl no-bindgen-comment
 
 --filter
     Windows.Win32.Foundation.E_INVALIDARG

crates/libs/version/src/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/libs/version/src/lib.rs

@@ -125,6 +125,7 @@ mod test {
             "--config",
             "flatten",
             "sys",
+            "no-bindgen-comment",
             "--filter",
             "Windows.Wdk.System.SystemServices.RtlGetVersion",
             "Windows.Win32.System.SystemInformation.OSVERSIONINFOEXW",

crates/tests/component/build.rs

@@ -40,6 +40,7 @@ fn main() {
         "test_component",
         "--config",
         "implement",
+        "no-bindgen-comment",
     ]);
 
     if !command.status().unwrap().success() {

crates/tests/component/src/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/component_client/build.rs

@@ -15,6 +15,8 @@ fn main() {
         "src/bindings.rs",
         "--filter",
         "test_component",
+        "--config",
+        "no-bindgen-comment",
     ]);
 
     if !command.status().unwrap().success() {

crates/tests/component_client/src/bindings.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/generic_interfaces.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/lib.rs

@@ -42,7 +42,18 @@ pub fn run_riddle(name: &str, dialect: &str, etc: &[&str]) -> Vec<windows_metada
     std::fs::remove_file(&rs).expect("Failed to delete output");
     let mut command = Command::new("cargo");
     command.args([
-        "run", "-p", "riddle", "--", "--in", &rdl, "--out", &rs, "--filter", "Test",
+        "run",
+        "-p",
+        "riddle",
+        "--",
+        "--in",
+        &rdl,
+        "--out",
+        &rs,
+        "--filter",
+        "Test",
+        "--config",
+        "no-bindgen-comment",
     ]);
     command.args(etc);
     assert!(command.status().unwrap().success());

crates/tests/riddle/src/module_attributes.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/nested_module.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/nested_struct.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/params.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/struct.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/win32_struct.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/riddle/src/winrt_struct.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/build.rs

@@ -228,7 +228,7 @@ fn riddle(output: &str, filter: &[&str], config: &[&str]) {
     ]);
 
     command.args(filter);
-    command.arg("--config");
+    command.args(["--config", "no-bindgen-comment"]);
     command.args(config);
 
     if !command.status().unwrap().success() {

crates/tests/standalone/src/b_arch.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_arch_dependencies.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_bstr.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_calendar.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_constant_types.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_depends.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_enumeration.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_enumerator.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_guid.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_hresult.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_hstring.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_include_me.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #[inline]
 pub unsafe fn GetVersion() -> u32 {
     ::windows_targets::link!("kernel32.dll" "system" fn GetVersion() -> u32);

crates/tests/standalone/src/b_inspectable.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_nested.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_none.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_overloads.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_pcstr.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_pcwstr.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_prepend.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_pstr.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_pwstr.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_std.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_stringable.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_test.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_unknown.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_uri.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_variant.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_vtbl_0.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_vtbl_1.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_vtbl_2.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_vtbl_3.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_vtbl_4.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,

crates/tests/standalone/src/b_win_enumerator.rs

@@ -1,5 +1,3 @@
-// Bindings generated by `windows-bindgen` 0.54.0
-
 #![allow(
     non_snake_case,
     non_upper_case_globals,