From b21ee84bbdd6d66025a4c9357fdeee305c48f9de Mon Sep 17 00:00:00 2001 From: Eric Devolder Date: Tue, 3 Sep 2024 16:56:15 +0200 Subject: [PATCH 1/2] fix compilation issues with Rust 1.79 Signed-off-by: Eric Devolder --- cryptoki/src/mechanism/mod.rs | 1 + cryptoki/src/object.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/cryptoki/src/mechanism/mod.rs b/cryptoki/src/mechanism/mod.rs index 0b501169..0c4bf23f 100644 --- a/cryptoki/src/mechanism/mod.rs +++ b/cryptoki/src/mechanism/mod.rs @@ -16,6 +16,7 @@ use std::ffi::c_void; use std::fmt::Formatter; use std::ops::Deref; use std::ptr::null_mut; +use std::mem::size_of; use crate::mechanism::rsa::PkcsOaepParams; pub use mechanism_info::MechanismInfo; diff --git a/cryptoki/src/object.rs b/cryptoki/src/object.rs index baa1e4d2..3cd4c7cc 100644 --- a/cryptoki/src/object.rs +++ b/cryptoki/src/object.rs @@ -12,6 +12,7 @@ use std::convert::TryInto; use std::ffi::c_void; use std::fmt::Formatter; use std::ops::Deref; +use std::mem::size_of; #[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)] #[non_exhaustive] From 52c77af31f0076cc7c75fb66b7173f4e5934da15 Mon Sep 17 00:00:00 2001 From: Eric Devolder Date: Wed, 4 Sep 2024 02:58:15 +0200 Subject: [PATCH 2/2] cargo fmt pass Signed-off-by: Eric Devolder --- cryptoki/src/mechanism/mod.rs | 2 +- cryptoki/src/object.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cryptoki/src/mechanism/mod.rs b/cryptoki/src/mechanism/mod.rs index 0c4bf23f..c18f2b56 100644 --- a/cryptoki/src/mechanism/mod.rs +++ b/cryptoki/src/mechanism/mod.rs @@ -14,9 +14,9 @@ use log::error; use std::convert::{TryFrom, TryInto}; use std::ffi::c_void; use std::fmt::Formatter; +use std::mem::size_of; use std::ops::Deref; use std::ptr::null_mut; -use std::mem::size_of; use crate::mechanism::rsa::PkcsOaepParams; pub use mechanism_info::MechanismInfo; diff --git a/cryptoki/src/object.rs b/cryptoki/src/object.rs index 3cd4c7cc..d66d97c4 100644 --- a/cryptoki/src/object.rs +++ b/cryptoki/src/object.rs @@ -11,8 +11,8 @@ use std::convert::TryFrom; use std::convert::TryInto; use std::ffi::c_void; use std::fmt::Formatter; -use std::ops::Deref; use std::mem::size_of; +use std::ops::Deref; #[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)] #[non_exhaustive]