Merge from rustc

[rust.git] / src / tools / miri / src / shims / windows / thread.rs

diff --git a/src/tools/miri/src/shims/windows/thread.rs b/src/tools/miri/src/shims/windows/thread.rs
index 1dbc848b03055e73f2f15865e006a95ad626d6fa..f5bf362ea1caf489fb26d5d3f2e48d1d41d235f2 100644 (file)
--- a/src/tools/miri/src/shims/windows/thread.rs
+++ b/src/tools/miri/src/shims/windows/thread.rs
@@ -34,7 +34,7 @@ fn CreateThread(
         };
 
         let stack_size_param_is_a_reservation =
-            this.eval_windows("c", "STACK_SIZE_PARAM_IS_A_RESERVATION")?.to_u32()?;
+            this.eval_windows_u32("c", "STACK_SIZE_PARAM_IS_A_RESERVATION");
 
         // We ignore the stack size, so we also ignore the
         // `STACK_SIZE_PARAM_IS_A_RESERVATION` flag.
@@ -73,7 +73,7 @@ fn WaitForSingleObject(
             _ => this.invalid_handle("WaitForSingleObject")?,
         };
 
-        if timeout != this.eval_windows("c", "INFINITE")?.to_u32()? {
+        if timeout != this.eval_windows_u32("c", "INFINITE") {
             throw_unsup_format!("`WaitForSingleObject` with non-infinite timeout");
         }