Update deps

Cldfire · Oct 14, 2023 · 9481e36 · 9481e36
1 parent fbf91bd
commit 9481e36
Show file tree

Hide file tree

Showing 23 changed files with 143 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nvml-wrapper-sys/Cargo.toml b/nvml-wrapper-sys/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["external-ffi-bindings", "hardware-support"]
 exclude = ["nvml.h"]
 
 [dependencies]
-libloading = "0.7.0"
+libloading = "0.8.1"
 
 [features]
 default = []

diff --git a/nvml-wrapper/Cargo.toml b/nvml-wrapper/Cargo.toml
@@ -16,14 +16,16 @@ categories = ["api-bindings", "hardware-support"]
 [features]
 default = []
 legacy-functions = ["nvml-wrapper-sys/legacy-functions"]
+serde = ["dep:serde", "serde_derive", "bitflags/serde"]
 
 [dependencies]
 thiserror = "1.0"
-bitflags = "1.3"
-serde = { version = "1.0", optional = true, features = ["derive"] }
+bitflags = "2.4.0"
+serde = { version = "1.0", optional = true }
+serde_derive = { version = "1.0.189", optional = true }
 nvml-wrapper-sys = { version = "0.7.0", path = "../nvml-wrapper-sys" }
 wrapcenum-derive = "0.4.0"
-libloading = "0.7.0"
+libloading = "0.8.1"
 static_assertions = "1.1"
 
 [dev-dependencies]

diff --git a/nvml-wrapper/src/bitmasks/device.rs b/nvml-wrapper/src/bitmasks/device.rs
@@ -3,12 +3,13 @@
 use crate::ffi::bindings::*;
 use bitflags::bitflags;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 bitflags! {
     /// Flags used to specify why a GPU is throttling.
     // Checked against local
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+    #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
     pub struct ThrottleReasons: u64 {
         /// Nothing is running on the GPU.
         ///
@@ -75,6 +76,7 @@ bitflags! {
 bitflags! {
     /// Flags that specify info about a frame capture session
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+    #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
     pub struct FbcFlags: u32 {
         const DIFFMAP_ENABLED             = NVML_NVFBC_SESSION_FLAG_DIFFMAP_ENABLED;
         const CLASSIFICATIONMAP_ENABLED   = NVML_NVFBC_SESSION_FLAG_CLASSIFICATIONMAP_ENABLED;

diff --git a/nvml-wrapper/src/bitmasks/event.rs b/nvml-wrapper/src/bitmasks/event.rs
@@ -1,7 +1,7 @@
 use crate::ffi::bindings::*;
 use bitflags::bitflags;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 bitflags! {
     /**
@@ -12,6 +12,7 @@ bitflags! {
     */
     // Checked against local
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+    #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
     pub struct EventTypes: u64 {
         /// A corrected texture memory error is not an ECC error, so it does not
         /// generate a single bit event.

diff --git a/nvml-wrapper/src/bitmasks/mod.rs b/nvml-wrapper/src/bitmasks/mod.rs
@@ -5,7 +5,7 @@ pub mod nv_link;
 use crate::ffi::bindings::*;
 use bitflags::bitflags;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 bitflags! {
     /// Generic flags used to specify the default behavior of some functions.
@@ -20,7 +20,7 @@ bitflags! {
 bitflags! {
     /// Flags that can be passed to `Nvml::init_with_flags()`.
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[derive(Default)]
+    #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Default)]
     pub struct InitFlags: u32 {
         /// Don't fail to initialize when no NVIDIA GPUs are found.
         const NO_GPUS = NVML_INIT_FLAG_NO_GPUS;

diff --git a/nvml-wrapper/src/bitmasks/nv_link.rs b/nvml-wrapper/src/bitmasks/nv_link.rs
@@ -1,7 +1,7 @@
 use crate::ffi::bindings::*;
 use bitflags::bitflags;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 bitflags! {
     /**
@@ -12,6 +12,7 @@ bitflags! {
     */
     // Checked against local
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+    #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
     pub struct PacketTypes: u32 {
         const NO_OP      = nvmlNvLinkUtilizationCountPktTypes_enum_NVML_NVLINK_COUNTER_PKTFILTER_NOP;
         const READ       = nvmlNvLinkUtilizationCountPktTypes_enum_NVML_NVLINK_COUNTER_PKTFILTER_READ;

diff --git a/nvml-wrapper/src/device.rs b/nvml-wrapper/src/device.rs
@@ -2474,7 +2474,7 @@ impl<'nvml> Device<'nvml> {
 
             Ok(addresses
                 .into_iter()
-                .zip(timestamps.into_iter())
+                .zip(timestamps)
                 .map(|(address, timestamp)| RetiredPage { address, timestamp })
                 .collect())
         }

diff --git a/nvml-wrapper/src/enum_wrappers/device.rs b/nvml-wrapper/src/enum_wrappers/device.rs
@@ -1,7 +1,7 @@
 use crate::error::NvmlError;
 use crate::ffi::bindings::*;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use wrapcenum_derive::EnumWrapper;
 
 /// API types that allow changes to default permission restrictions.

diff --git a/nvml-wrapper/src/enum_wrappers/nv_link.rs b/nvml-wrapper/src/enum_wrappers/nv_link.rs
@@ -1,7 +1,7 @@
 use crate::error::NvmlError;
 use crate::ffi::bindings::*;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use wrapcenum_derive::EnumWrapper;
 
 /// Represents the NvLink utilization counter packet units.