assertions: replace with static_assertions

crosvm has dropped the assertions crate in favor of the more commonly
used static_assertions crate. This change does the same for salus.
This breaks the only local dep in sbi which will allow that crate to be
pulled out and re-used more easily.

Signed-off-by: Dylan Reid <dgreid@rivosinc.com>

Cargo.toml

@@ -12,7 +12,7 @@ panic = "abort"
 
 [dependencies]
 arrayvec = { version = "0.7.2", default-features = false }
-assertions = { path = "./assertions" }
+static_assertions = "1.1"
 attestation = { path = "./attestation" }
 const-oid = { version = "0.9.0", features = ["db"] }
 data_model = { path = "./data-model" }

data-model/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["The Chromium OS Authors"]
 edition = "2021"
 
 [dependencies]
-assertions = { path = "../assertions" }
+static_assertions = "1.1"

data-model/src/endian.rs

@@ -32,7 +32,7 @@
 
 use core::mem::{align_of, size_of};
 
-use assertions::const_assert;
+use static_assertions::const_assert;
 
 use crate::DataInit;
 

drivers/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 
 [dependencies]
 arrayvec = { version = "0.7.2", default-features = false }
-assertions = { path = "../assertions" }
 const-field-offset = { version = "0.1.2" }
 data_model = { path = "../data-model" }
 device_tree = { path = "../device-tree" }
@@ -19,6 +18,7 @@ riscv_page_tables = { path = "../riscv-page-tables" }
 riscv_pages = { path = "../riscv-pages" }
 riscv_regs = { path = "../riscv-regs" }
 spin = { version = "*", default-features = false, features = ["once"] }
+static_assertions = "1.1"
 tock-registers = { version = "0.7" }
 sbi = { path = "../sbi" }
 s_mode_utils = { path = "../s-mode-utils" }

drivers/src/iommu/device_directory.rs

@@ -2,12 +2,12 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-use assertions::const_assert;
 use core::marker::PhantomData;
 use riscv_page_tables::{GuestStagePageTable, GuestStagePagingMode};
 use riscv_pages::*;
 use riscv_regs::dma_wmb;
 use spin::Mutex;
+use static_assertions::const_assert;
 
 use super::error::*;
 use super::msi_page_table::MsiPageTable;

drivers/src/iommu/registers.rs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-use assertions::const_assert;
+use static_assertions::const_assert;
 use tock_registers::register_bitfields;
 use tock_registers::registers::{ReadOnly, ReadWrite};
 

drivers/src/pci/registers.rs

@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-use assertions::const_assert;
 use const_field_offset::FieldOffsets;
+use static_assertions::const_assert;
 use tock_registers::interfaces::Readable;
 use tock_registers::registers::{ReadOnly, ReadWrite};
 use tock_registers::{register_bitfields, LocalRegisterCopy, RegisterLongName, UIntLike};

sbi/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 arrayvec = { version = "0.7.2", default-features = false }
-assertions = { path = "../assertions" }
+static_assertions = "1.1"
 flagset = "0.4.3"
 
 [lib]

sbi/src/api/tee_host.rs

@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-use assertions::const_assert;
 use core::{marker::PhantomData, ptr};
+use static_assertions::const_assert;
 
 use crate::TeeHostFunction::*;
 use crate::{ecall_send, Error, Result, SbiMessage};