Merge pull request #105 from Freax13/bump/toolchain-2024-12-28

update toolchain & dependencies
Freax13 · Dec 28, 2024 · 4574b49 · 4574b49
2 parents bd88397 + fbc18a1
commit 4574b49
Show file tree

Hide file tree

Showing 22 changed files with 529 additions and 261 deletions.
diff --git a/common/Cargo.lock b/common/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -9,4 +9,5 @@ snp-types = { path = "snp-types" }
 tdx-types = { path = "tdx-types" }
 
 [patch.crates-io]
-x86_64 = { git = "https://github.com/rust-osdev/x86_64.git", rev = "3fc9106" }
+bytemuck = { git = "https://github.com/Freax13/bytemuck.git", rev = "be10405" }
+x86_64 = { git = "https://github.com/rust-osdev/x86_64.git", rev = "59ac07c" }
diff --git a/common/loader/Cargo.toml b/common/loader/Cargo.toml
@@ -11,6 +11,6 @@ goblin = "0.9.2"
 io = { workspace = true }
 itertools = { version = "0.13.0", default-features = false }
 snp-types = { workspace = true }
-thiserror = { version = "1.0.58" }
+thiserror = "2.0.9"
 raw-cpuid = "11.0.1"
 x86_64 = { version = "0.15.1", default-features = false }
diff --git a/common/snp-types/src/cpuid.rs b/common/snp-types/src/cpuid.rs
@@ -99,7 +99,7 @@ impl CpuidFunction {
 
     pub fn matches(&self, eax: u32, ecx: Option<u32>, xcr0: u64, xss: u64) -> bool {
         self.eax_in == eax
-            && ecx.map_or(true, |ecx| self.ecx_in == ecx)
+            && ecx.is_none_or(|ecx| self.ecx_in == ecx)
             && self.xcr0_in == xcr0
             && self.xss_in == xss
             && self._reserved == 0

diff --git a/common/tdx-types/Cargo.toml b/common/tdx-types/Cargo.toml
@@ -10,7 +10,7 @@ bytemuck = { version = "1.15.0", features = ["derive", "min_const_generics"] }
 p256 = { version = "0.13.2", optional = true }
 serde = { version = "1.0.213", features = ["derive"], optional = true }
 sha2 = { version = "0.10.8", optional = true }
-thiserror = { version = "1.0.64", optional = true }
+thiserror = { version = "2.0.9", optional = true }
 uuid = { version = "1.11.0", features = ["bytemuck"], default-features = false }
 x509-cert = { version = "0.2.5", features = ["pem"], default-features = false, optional = true }
 x86_64 = { version = "0.15.1", default-features = false }