Merge branch 'main' into dependabot/cargo/proc-macro2-1.0.82

microsoft · May 9, 2024 · a7ad188 · a7ad188
2 parents 63e0645 + c5ea4ef
commit a7ad188
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 39 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -90,7 +90,7 @@ jobs:
       - name: Install Cargo Udeps
         uses: taiki-e/install-action@v2
         with:
-          tool: cargo-udeps
+          tool: cargo-udeps@0.1.48
 
       - name: Run Cargo Udeps
         run: cargo +nightly udeps --locked --all-targets

diff --git a/crates/wdk-build/build.rs b/crates/wdk-build/build.rs
@@ -3,10 +3,16 @@
 
 //! Build script for the `wdk-build` crate.
 
-#[rustversion::nightly]
 fn main() {
-    println!("cargo:rustc-cfg=nightly_toolchain");
+    println!("cargo::rustc-check-cfg=cfg(nightly_toolchain)");
+    setup_nightly_cfgs();
+}
+
+// Custom attributes cannot be applied to expressions yet, so separate functions are required for nightly/non-nightly: https://github.com/rust-lang/rust/issues/15701
+#[rustversion::nightly]
+fn setup_nightly_cfgs() {
+    println!("cargo::rustc-cfg=nightly_toolchain");
 }
 
 #[rustversion::not(nightly)]
-fn main() {}
+const fn setup_nightly_cfgs() {}
diff --git a/crates/wdk-build/src/lib.rs b/crates/wdk-build/src/lib.rs
@@ -486,25 +486,25 @@ impl Config {
 
         // Emit linker search paths
         for path in library_paths {
-            println!("cargo:rustc-link-search={}", path.display());
+            println!("cargo::rustc-link-search={}", path.display());
         }
 
         match &self.driver_config {
             DriverConfig::WDM() => {
                 // Emit WDM-specific libraries to link to
-                println!("cargo:rustc-link-lib=BufferOverflowFastFailK");
-                println!("cargo:rustc-link-lib=ntoskrnl");
-                println!("cargo:rustc-link-lib=hal");
-                println!("cargo:rustc-link-lib=wmilib");
+                println!("cargo::rustc-link-lib=BufferOverflowFastFailK");
+                println!("cargo::rustc-link-lib=ntoskrnl");
+                println!("cargo::rustc-link-lib=hal");
+                println!("cargo::rustc-link-lib=wmilib");
             }
             DriverConfig::KMDF(_) => {
                 // Emit KMDF-specific libraries to link to
-                println!("cargo:rustc-link-lib=BufferOverflowFastFailK");
-                println!("cargo:rustc-link-lib=ntoskrnl");
-                println!("cargo:rustc-link-lib=hal");
-                println!("cargo:rustc-link-lib=wmilib");
-                println!("cargo:rustc-link-lib=WdfLdr");
-                println!("cargo:rustc-link-lib=WdfDriverEntry");
+                println!("cargo::rustc-link-lib=BufferOverflowFastFailK");
+                println!("cargo::rustc-link-lib=ntoskrnl");
+                println!("cargo::rustc-link-lib=hal");
+                println!("cargo::rustc-link-lib=wmilib");
+                println!("cargo::rustc-link-lib=WdfLdr");
+                println!("cargo::rustc-link-lib=WdfDriverEntry");
             }
             DriverConfig::UMDF(umdf_config) => {
                 // Emit UMDF-specific libraries to link to
@@ -515,22 +515,22 @@ impl Config {
                     .as_str()
                 {
                     "release" => {
-                        println!("cargo:rustc-link-lib=ucrt");
+                        println!("cargo::rustc-link-lib=ucrt");
                     }
                     "debug" => {
-                        println!("cargo:rustc-link-lib=ucrtd");
+                        println!("cargo::rustc-link-lib=ucrtd");
                     }
                     _ => {
                         unreachable!(r#"Cargo should always set a value of "release" or "debug""#);
                     }
                 }
 
                 if umdf_config.umdf_version_major >= 2 {
-                    println!("cargo:rustc-link-lib=WdfDriverStubUm");
-                    println!("cargo:rustc-link-lib=ntdll");
+                    println!("cargo::rustc-link-lib=WdfDriverStubUm");
+                    println!("cargo::rustc-link-lib=ntdll");
                 }
 
-                println!("cargo:rustc-link-lib=mincore");
+                println!("cargo::rustc-link-lib=mincore");
             }
         }
 
@@ -555,49 +555,49 @@ impl Config {
         self.configure_library_build()?;
 
         // Linker arguments derived from Microsoft.Link.Common.props in Ni(22H2) WDK
-        println!("cargo:rustc-cdylib-link-arg=/NXCOMPAT");
-        println!("cargo:rustc-cdylib-link-arg=/DYNAMICBASE");
+        println!("cargo::rustc-cdylib-link-arg=/NXCOMPAT");
+        println!("cargo::rustc-cdylib-link-arg=/DYNAMICBASE");
 
         // Always generate Map file with Exports
-        println!("cargo:rustc-cdylib-link-arg=/MAP");
-        println!("cargo:rustc-cdylib-link-arg=/MAPINFO:EXPORTS");
+        println!("cargo::rustc-cdylib-link-arg=/MAP");
+        println!("cargo::rustc-cdylib-link-arg=/MAPINFO:EXPORTS");
 
         // Force Linker Optimizations
-        println!("cargo:rustc-cdylib-link-arg=/OPT:REF,ICF");
+        println!("cargo::rustc-cdylib-link-arg=/OPT:REF,ICF");
 
         // Enable "Forced Integrity Checking" to prevent non-signed binaries from
         // loading
-        println!("cargo:rustc-cdylib-link-arg=/INTEGRITYCHECK");
+        println!("cargo::rustc-cdylib-link-arg=/INTEGRITYCHECK");
 
         // Disable Manifest File Generation
-        println!("cargo:rustc-cdylib-link-arg=/MANIFEST:NO");
+        println!("cargo::rustc-cdylib-link-arg=/MANIFEST:NO");
 
         match &self.driver_config {
             DriverConfig::WDM() => {
                 // Linker arguments derived from WindowsDriver.KernelMode.props in Ni(22H2) WDK
-                println!("cargo:rustc-cdylib-link-arg=/DRIVER");
-                println!("cargo:rustc-cdylib-link-arg=/NODEFAULTLIB");
-                println!("cargo:rustc-cdylib-link-arg=/SUBSYSTEM:NATIVE");
-                println!("cargo:rustc-cdylib-link-arg=/KERNEL");
+                println!("cargo::rustc-cdylib-link-arg=/DRIVER");
+                println!("cargo::rustc-cdylib-link-arg=/NODEFAULTLIB");
+                println!("cargo::rustc-cdylib-link-arg=/SUBSYSTEM:NATIVE");
+                println!("cargo::rustc-cdylib-link-arg=/KERNEL");
 
                 // Linker arguments derived from WindowsDriver.KernelMode.WDM.props in Ni(22H2)
                 // WDK
-                println!("cargo:rustc-cdylib-link-arg=/ENTRY:DriverEntry");
+                println!("cargo::rustc-cdylib-link-arg=/ENTRY:DriverEntry");
             }
             DriverConfig::KMDF(_) => {
                 // Linker arguments derived from WindowsDriver.KernelMode.props in Ni(22H2) WDK
-                println!("cargo:rustc-cdylib-link-arg=/DRIVER");
-                println!("cargo:rustc-cdylib-link-arg=/NODEFAULTLIB");
-                println!("cargo:rustc-cdylib-link-arg=/SUBSYSTEM:NATIVE");
-                println!("cargo:rustc-cdylib-link-arg=/KERNEL");
+                println!("cargo::rustc-cdylib-link-arg=/DRIVER");
+                println!("cargo::rustc-cdylib-link-arg=/NODEFAULTLIB");
+                println!("cargo::rustc-cdylib-link-arg=/SUBSYSTEM:NATIVE");
+                println!("cargo::rustc-cdylib-link-arg=/KERNEL");
 
                 // Linker arguments derived from WindowsDriver.KernelMode.KMDF.props in
                 // Ni(22H2) WDK
-                println!("cargo:rustc-cdylib-link-arg=/ENTRY:FxDriverEntry");
+                println!("cargo::rustc-cdylib-link-arg=/ENTRY:FxDriverEntry");
             }
             DriverConfig::UMDF(_) => {
                 // Linker arguments derived from WindowsDriver.UserMode.props in Ni(22H2) WDK
-                println!("cargo:rustc-cdylib-link-arg=/SUBSYSTEM:WINDOWS");
+                println!("cargo::rustc-cdylib-link-arg=/SUBSYSTEM:WINDOWS");
             }
         }
 
@@ -620,7 +620,7 @@ impl Config {
             return Err(ExportError::MissingLinksValue(var_error));
         }
         println!(
-            "cargo:{}={}",
+            "cargo::metadata={}={}",
             Self::CARGO_CONFIG_KEY,
             serde_json::to_string(self)?
         );