dependency updates and resulting necessary changes

rustyhorde · Jul 22, 2022 · 8b20805 · 8b20805
1 parent 5997a34
commit 8b20805
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,11 +27,11 @@ local_offset = ["time/local-offset"]
 [dependencies]
 anyhow = "1"
 cfg-if = "1"
-enum-iterator = "0.7"
+enum-iterator = "1.1.3"
 getset = "0"
 git2 = { version = "0", optional = true, default-features = false }
 rustc_version = { version = "0.4.0", optional = true }
-sysinfo = { version = "=0.23", optional = true, default-features = false }
+sysinfo = { version = "0.24.7", optional = true, default-features = false }
 thiserror = "1"
 time = { version = "0.3.7", optional = true }
 

diff --git a/src/config.rs b/src/config.rs
@@ -34,7 +34,7 @@ use crate::{
     },
 };
 use anyhow::Result;
-use enum_iterator::IntoEnumIterator;
+use enum_iterator::{all, Sequence};
 use getset::{Getters, MutGetters};
 use std::{
     collections::BTreeMap,
@@ -161,7 +161,7 @@ impl Instructions {
 }
 
 /// Build information keys.
-#[derive(Clone, Copy, Debug, IntoEnumIterator, Hash, Eq, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Debug, Hash, Eq, Ord, PartialEq, PartialOrd, Sequence)]
 pub(crate) enum VergenKey {
     /// The build date. (VERGEN_BUILD_DATE)
     BuildDate,
@@ -288,7 +288,12 @@ pub(crate) struct Config {
 impl Default for Config {
     fn default() -> Config {
         Self {
-            cfg_map: VergenKey::into_enum_iter().map(|x| (x, None)).collect(),
+            cfg_map: all::<VergenKey>()
+                .collect::<Vec<_>>()
+                .iter()
+                .copied()
+                .map(|x| (x, None))
+                .collect(),
             head_path: Option::default(),
             ref_path: Option::default(),
         }

diff --git a/src/feature/si.rs b/src/feature/si.rs
@@ -19,7 +19,7 @@ use {
 use {
     crate::{config::VergenKey, feature::add_entry},
     getset::{Getters, MutGetters},
-    sysinfo::{ProcessorExt, System, SystemExt},
+    sysinfo::{CpuExt, System, SystemExt},
 };
 
 /// Configuration for the `VERGEN_SYSINFO_*` instructions
@@ -199,7 +199,7 @@ pub(crate) fn configure_sysinfo(instructions: &Instructions, config: &mut Config
                 config.cfg_map_mut(),
                 VergenKey::SysinfoCpuVendor,
                 system
-                    .processors()
+                    .cpus()
                     .get(0)
                     .map(|processor| processor.vendor_id().to_string()),
             );
@@ -219,9 +219,9 @@ pub(crate) fn configure_sysinfo(instructions: &Instructions, config: &mut Config
                 VergenKey::SysinfoCpuName,
                 Some(
                     system
-                        .processors()
+                        .cpus()
                         .iter()
-                        .map(ProcessorExt::name)
+                        .map(CpuExt::name)
                         .collect::<Vec<&str>>()
                         .join(","),
                 ),
@@ -233,7 +233,7 @@ pub(crate) fn configure_sysinfo(instructions: &Instructions, config: &mut Config
                 config.cfg_map_mut(),
                 VergenKey::SysinfoCpuBrand,
                 system
-                    .processors()
+                    .cpus()
                     .get(0)
                     .map(|processor| processor.brand().to_string()),
             );
@@ -244,7 +244,7 @@ pub(crate) fn configure_sysinfo(instructions: &Instructions, config: &mut Config
                 config.cfg_map_mut(),
                 VergenKey::SysinfoCpuFrequency,
                 system
-                    .processors()
+                    .cpus()
                     .get(0)
                     .map(|processor| processor.frequency().to_string()),
             );