diff --git a/Cargo.lock b/Cargo.lock index 66fc427fb..b1434ae58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1061,7 +1061,7 @@ dependencies = [ "http 0.2.12", "log", "maplit", - "num-derive 0.3.3", + "num-derive", "num-traits", "openssl", "openssl-kdf", @@ -2205,17 +2205,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "num-derive" version = "0.4.2" @@ -3611,7 +3600,7 @@ dependencies = [ "hostname-validator", "log", "mbox", - "num-derive 0.4.2", + "num-derive", "num-traits", "oid", "picky-asn1", diff --git a/client-linuxapp/src/main.rs b/client-linuxapp/src/main.rs index 31baca81f..344cd67e2 100644 --- a/client-linuxapp/src/main.rs +++ b/client-linuxapp/src/main.rs @@ -1231,7 +1231,8 @@ async fn main() -> Result<()> { Command::new("systemctl") .arg("reboot") .spawn() - .expect("Reboot failed"); + .expect("Reboot failed") + .wait()?; } Ok(()) } diff --git a/client-linuxapp/src/serviceinfo.rs b/client-linuxapp/src/serviceinfo.rs index 1f3144712..0ee6557d5 100644 --- a/client-linuxapp/src/serviceinfo.rs +++ b/client-linuxapp/src/serviceinfo.rs @@ -108,6 +108,8 @@ fn create_user_with_password(user: &str, password: &str) -> Result<()> { log::info!("Checking for password encryption"); if !is_password_encrypted(password) { log::info!("Encrypting password"); + #[allow(unknown_lints)] + #[allow(clippy::zombie_processes)] let echo = Command::new("echo") .arg(password) .stdout(Stdio::piped()) diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml index 7bcd9705e..dfa95c152 100644 --- a/data-formats/Cargo.toml +++ b/data-formats/Cargo.toml @@ -20,7 +20,7 @@ thiserror = "1" aws-nitro-enclaves-cose = { path = "../external/aws-nitro-enclaves-cose"} uuid = "1.3" num-traits = "0.2" -num-derive = "0.3" +num-derive = "0.4" paste = "1.0" pem = "3.0" tss-esapi = { version = "7.4", features = ["generate-bindings"] } diff --git a/data-formats/src/constants/serviceinfo_names.rs b/data-formats/src/constants/serviceinfo_names.rs index bf89f3615..6a2dbf6a6 100644 --- a/data-formats/src/constants/serviceinfo_names.rs +++ b/data-formats/src/constants/serviceinfo_names.rs @@ -6,7 +6,7 @@ impl<'de> serde::Deserialize<'de> for ServiceInfoModule { D: serde::de::Deserializer<'de>, { struct SIMVisitor; - impl<'de> serde::de::Visitor<'de> for SIMVisitor { + impl serde::de::Visitor<'_> for SIMVisitor { type Value = ServiceInfoModule; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/data-formats/src/ownershipvoucher.rs b/data-formats/src/ownershipvoucher.rs index e1dd9fb29..5eab32ce2 100644 --- a/data-formats/src/ownershipvoucher.rs +++ b/data-formats/src/ownershipvoucher.rs @@ -327,6 +327,8 @@ impl OwnershipVoucher { } impl<'a> OwnershipVoucher { + #[allow(unknown_lints)] + #[allow(elided_named_lifetimes)] pub fn iter_entries(&'a self) -> Result { Ok(EntryIter { voucher: self, @@ -347,7 +349,7 @@ pub struct EntryIter<'a> { last_pubkey: PublicKey, } -impl<'a> Iterator for EntryIter<'a> { +impl Iterator for EntryIter<'_> { type Item = Result; fn next(&mut self) -> Option { @@ -378,7 +380,7 @@ impl<'a> Iterator for EntryIter<'a> { } } -impl<'a> EntryIter<'a> { +impl EntryIter<'_> { fn process_element( &mut self, entry: OwnershipVoucherEntry, diff --git a/data-formats/src/types.rs b/data-formats/src/types.rs index 4e0d84052..fba940ad0 100644 --- a/data-formats/src/types.rs +++ b/data-formats/src/types.rs @@ -390,7 +390,7 @@ impl<'de> Deserialize<'de> for IPAddress { { struct IPAddressVisitor; - impl<'de> serde::de::Visitor<'de> for IPAddressVisitor { + impl serde::de::Visitor<'_> for IPAddressVisitor { type Value = IPAddress; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { @@ -1304,7 +1304,7 @@ impl<'de> Deserialize<'de> for KexSuite { { struct KexSuiteVisitor; - impl<'de> serde::de::Visitor<'de> for KexSuiteVisitor { + impl serde::de::Visitor<'_> for KexSuiteVisitor { type Value = KexSuite; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { @@ -1964,7 +1964,7 @@ impl<'de> Deserialize<'de> for RemoteTransport { { struct RemoteTransportVisitor; - impl<'de> serde::de::Visitor<'de> for RemoteTransportVisitor { + impl serde::de::Visitor<'_> for RemoteTransportVisitor { type Value = RemoteTransport; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {