From c4b17500a61f7d7228a91c521103d26f47cb507d Mon Sep 17 00:00:00 2001
From: Arlie Davis <ardavis@microsoft.com>
Date: Thu, 6 Jun 2024 08:03:26 -0700
Subject: [PATCH] fix for old and new tools

---
 crates/libs/core/src/imp/weak_ref_count.rs | 2 +-
 crates/libs/metadata/src/blob.rs           | 1 +
 crates/libs/metadata/src/file.rs           | 1 +
 crates/libs/version/src/lib.rs             | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/libs/core/src/imp/weak_ref_count.rs b/crates/libs/core/src/imp/weak_ref_count.rs
index 92fcf673139..c7cae7c2f1a 100644
--- a/crates/libs/core/src/imp/weak_ref_count.rs
+++ b/crates/libs/core/src/imp/weak_ref_count.rs
@@ -64,7 +64,7 @@ impl WeakRefCount {
         let tear_off = TearOff::new(object, count_or_pointer as u32);
         let tear_off_ptr: *mut c_void = transmute_copy(&tear_off);
         let encoding: usize =
-            ((tear_off_ptr as usize) >> 1) | (1 << (core::mem::size_of::<usize>() * 8 - 1));
+            ((tear_off_ptr as usize) >> 1) | (1 << (usize::BITS - 1));
 
         loop {
             match self.0.compare_exchange_weak(
diff --git a/crates/libs/metadata/src/blob.rs b/crates/libs/metadata/src/blob.rs
index 8d90f3958fc..08118c9e8ec 100644
--- a/crates/libs/metadata/src/blob.rs
+++ b/crates/libs/metadata/src/blob.rs
@@ -1,4 +1,5 @@
 use super::*;
+use core::mem::align_of;
 
 pub struct Blob {
     pub file: &'static File,
diff --git a/crates/libs/metadata/src/file.rs b/crates/libs/metadata/src/file.rs
index 8a7d4181594..da45c141a5c 100644
--- a/crates/libs/metadata/src/file.rs
+++ b/crates/libs/metadata/src/file.rs
@@ -1,4 +1,5 @@
 use super::*;
+use core::mem::{align_of, size_of};
 
 pub struct File {
     pub reader: *const Reader,
diff --git a/crates/libs/version/src/lib.rs b/crates/libs/version/src/lib.rs
index 8b4da150859..73550e5dffc 100644
--- a/crates/libs/version/src/lib.rs
+++ b/crates/libs/version/src/lib.rs
@@ -4,6 +4,8 @@ Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs
 
 #![cfg_attr(not(test), no_std)]
 
+use core::mem::size_of;
+
 mod bindings;
 use bindings::*;