fix merge issues

rust-lang · Sep 23, 2024 · 064f71c · 064f71c
1 parent 7ce4040
commit 064f71c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/library/std/src/os/windows/process.rs b/library/std/src/os/windows/process.rs
@@ -426,7 +426,9 @@ impl CommandExt for process::Command {
         value_ptr: *const c_void,
         value_size: usize,
     ) -> &mut process::Command {
-        self.as_inner_mut().raw_attribute_ptr(attribute, value_ptr, value_size);
+        unsafe {
+            self.as_inner_mut().raw_attribute_ptr(attribute, value_ptr, value_size);
+        }
         self
     }
 }

diff --git a/library/std/src/sys/pal/windows/process.rs b/library/std/src/sys/pal/windows/process.rs
@@ -274,6 +274,7 @@ impl Command {
                 size: value_size,
                 pointer: value_ptr as isize,
             }),
+        );
     }
 
     pub fn spawn(