Merge pull request #295 from facebookexperimental/dep-updates

Dependency updates and build warning fixes

rd-agent-intf/Cargo.toml

@@ -15,11 +15,11 @@ readme = "README.md"
 rd-util = { path = "../rd-util", version = "2.2.4" }
 rd-hashd-intf = { path = "../rd-hashd-intf", version = "2.2.4" }
 
-anyhow = "^1.0"
-clap = "^2.33"
-chrono = { version = "^0.4", features = ["serde"] }
-enum-iterator = "^0.7"
-lazy_static = "^1.4"
-libc = "^0.2"
-log = "^0.4"
-serde = { version = "^1.0", features = ["derive"] }
+anyhow = "1.0"
+clap = "2.33"
+chrono = { version = "0.4", features = ["serde"] }
+enum-iterator = "0.7"
+lazy_static = "1.4"
+libc = "0.2"
+log = "0.4"
+serde = { version = "1.0", features = ["derive"] }

rd-agent/Cargo.toml

@@ -16,22 +16,22 @@ rd-util = { path = "../rd-util", version = "2.2.4" }
 rd-hashd-intf = { path = "../rd-hashd-intf", version = "2.2.4" }
 rd-agent-intf = { path = "../rd-agent-intf", version = "2.2.4" }
 
-anyhow = "^1.0"
-chrono = { version = "^0.4", features = ["serde"] }
-crossbeam = "^0.8"
-enum-iterator = "^0.7"
-glob = "^0.3"
-json = "^0.12"
-lazy_static = "^1.4"
-libc = "^0.2"
-linux_proc = "^0.1"
-log = "^0.4"
-nix = "^0.23"
-procfs = "^0.12"
-proc-mounts = "^0.2"
-regex = "^1.5"
-scan_fmt = "^0.2"
-serde = { version = "^1.0", features = ["derive"] }
-serde_json = "^1.0"
-sysinfo = "^0.23"
-users = "^0.11"
+anyhow = "1.0"
+chrono = { version = "0.4", features = ["serde"] }
+crossbeam = "0.8"
+enum-iterator = "0.7"
+glob = "0.3"
+json = "0.12"
+lazy_static = "1.4"
+libc = "0.2"
+linux_proc = "0.1"
+log = "0.4"
+nix = "0.23"
+procfs = "0.12"
+proc-mounts = "0.2"
+regex = "1.5"
+scan_fmt = "0.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+sysinfo = "0.23"
+uzers = "0.11"

rd-agent/src/hashd.rs

@@ -166,7 +166,7 @@ impl Hashd {
     }
 
     fn update_resctl(&mut self, mem_low: u64, frac: f64) -> Result<()> {
-        let mut svc = self.svc.as_mut().unwrap();
+        let svc = self.svc.as_mut().unwrap();
 
         svc.unit.resctl = systemd::UnitResCtl {
             cpu_weight: Some((100.0 * frac).ceil() as u64),

rd-agent/src/main.rs

@@ -208,7 +208,7 @@ impl Config {
     fn sgid_top<P: AsRef<Path>>(top_path: &str, args_path: Option<&P>) -> Result<()> {
         let mut group = None;
         for name in ["wheel", "sudo", "adm"].iter() {
-            group = users::get_group_by_name(name);
+            group = uzers::get_group_by_name(name);
             if group.is_some() {
                 break;
             }

rd-hashd-intf/Cargo.toml

@@ -14,8 +14,8 @@ readme = "README.md"
 [dependencies]
 rd-util = { path = "../rd-util", version = "2.2.4" }
 
-anyhow = "^1.0"
-chrono = { version = "^0.4", features = ["serde"] }
-clap = "^2.33"
-lazy_static = "^1.4"
-serde = { version = "^1.0", features = ["derive"] }
+anyhow = "1.0"
+chrono = { version = "0.4", features = ["serde"] }
+clap = "2.33"
+lazy_static = "1.4"
+serde = { version = "1.0", features = ["derive"] }

rd-hashd/Cargo.toml

@@ -13,21 +13,21 @@ readme = "README.md"
 rd-util = { path = "../rd-util", version = "2.2.4" }
 rd-hashd-intf = { path = "../rd-hashd-intf", version = "2.2.4" }
 
-anyhow = "^1.0"
-chrono = { version = "^0.4", features = ["serde"] }
-console = "^0.15"
-crossbeam = "^0.8"
-env_logger = "^0.9"
-glob = "^0.3"
-indicatif = "^0.16"
-lazy_static = "^1.4"
-libc = "^0.2"
-linreg = "^0.2"
-log = "^0.4"
-num = "^0.4"
-pid = "^3.0"
-quantiles = "^0.7"
-rand = { version = "^0.8", features = ["small_rng"] }
-rand_distr = "^0.4"
-scan_fmt = "^0.2"
-sha1_smol = "^1.0"
+anyhow = "1.0"
+chrono = { version = "0.4", features = ["serde"] }
+console = "0.15"
+crossbeam = "0.8"
+env_logger = "0.9"
+glob = "0.3"
+indicatif = "0.16"
+lazy_static = "1.4"
+libc = "0.2"
+linreg = "0.2"
+log = "0.4"
+num = "0.4"
+pid = "3.0"
+quantiles = "0.7"
+rand = { version = "0.8", features = ["small_rng"] }
+rand_distr = "0.4"
+scan_fmt = "0.2"
+sha1_smol = "1.0"

rd-util/Cargo.toml

@@ -12,30 +12,30 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "^1.0"
-chrono = "^0.4"
-clap = "^2.33"
-console = "^0.15"
-crossbeam = "^0.8"
-ctrlc = { version = "^3.2", features = ["termination"] }
-env_logger = "^0.9"
-glob = "^0.3"
-json = "^0.12"
-lazy_static = "^1.4"
-libc = "^0.2"
-log = "^0.4"
-num = "^0.4"
-num_cpus = "^1.13"
-page_size = "^0.4"
-proc-mounts = "^0.2"
-rand = { version = "^0.8", features = ["small_rng"] }
-rustbus = "^0.17"
-scan_fmt = "^0.2"
-serde = { version = "^1.0", features = ["derive"] }
-serde_json = "^1.0"
-simplelog = "^0.11"
-sysinfo = "^0.23"
+anyhow = "1.0"
+chrono = "0.4"
+clap = "2.33"
+console = "0.15"
+crossbeam = "0.8"
+ctrlc = { version = "3.2", features = ["termination"] }
+env_logger = "0.9"
+glob = "0.3"
+json = "0.12"
+lazy_static = "1.4"
+libc = "0.2"
+log = "0.4"
+num = "0.4"
+num_cpus = "1.13"
+page_size = "0.4"
+proc-mounts = "0.2"
+rand = { version = "0.8", features = ["small_rng"] }
+rustbus = "0.17"
+scan_fmt = "0.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+simplelog = "0.11"
+sysinfo = "0.23"
 
 [build-dependencies]
-anyhow = "^1.0"
-vergen = "^7.0"
+anyhow = "1.0"
+vergen = "7.0"

resctl-bench-intf/Cargo.toml

@@ -17,8 +17,8 @@ lambda = []
 rd-util = { path = "../rd-util", version = "2.2.4" }
 rd-agent-intf = { path = "../rd-agent-intf", version = "2.2.4" }
 
-anyhow = "^1.0"
-clap = "^2.33"
-lazy_static = "^1.4"
-log = "^0.4"
-serde = { version = "^1.0", features = ["derive"] }
+anyhow = "1.0"
+clap = "2.33"
+lazy_static = "1.4"
+log = "0.4"
+serde = { version = "1.0", features = ["derive"] }

resctl-bench/Cargo.toml

@@ -29,29 +29,29 @@ md5 = { version = "0.7", optional = true  }
 octocrab = { version = "0.28.0", optional = true, features = ["rustls"], default-features = false }
 tokio = { version = "1.29.1", optional = true }
 
-anyhow = "^1.0"
-base64 = "^0.13"
-chrono = "^0.4"
-console = "^0.15"
-env_logger = "^0.9"
-indicatif = "^0.16"
-lazy_static = "^1.4"
-libc = "^0.2"
-libflate = "^1.1"
-linreg = "^0.2"
-log = "^0.4"
+anyhow = "1.0"
+base64 = "0.13"
+chrono = "0.4"
+console = "0.15"
+env_logger = "0.9"
+indicatif = "0.16"
+lazy_static = "1.4"
+libc = "0.2"
+libflate = "1.1"
+linreg = "0.2"
+log = "0.4"
 minreq = { version= "2.8.1", features = ["https-rustls", "json-using-serde"] }
-num-traits = "^0.2"
-plotlib = "^0.5"
-quantiles = "^0.7"
-rand = "^0.8"
-scan_fmt = "^0.2"
-serde = { version = "^1.0", features = ["derive"] }
-serde_json = "^1.0"
-statistical = "^1.0"
-statrs = "^0.15"
-sysinfo = "^0.23"
-tar = "^0.4"
-tempfile = "^3.3"
-term_size = "^0.3"
-thiserror = "^1.0"
+num-traits = "0.2"
+plotlib = "0.5"
+quantiles = "0.7"
+rand = "0.8"
+scan_fmt = "0.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+statistical = "1.0"
+statrs = "0.16"
+sysinfo = "0.23"
+tar = "0.4"
+tempfile = "3.3"
+term_size = "0.3"
+thiserror = "1.0"

resctl-bench/src/bench/iocost_tune.rs

@@ -2354,7 +2354,7 @@ impl IoCostTuneJob {
             .map(|name| {
                 res.solutions
                     .get(*name)
-                    .and_then(|s| Some((name.clone(), s)))
+                    .and_then(|s| Some((*name, s)))
             })
             .filter_map(|s| s)
             .collect();

resctl-bench/src/run.rs

@@ -447,7 +447,7 @@ impl<'a, 'b> RunCtx<'a, 'b> {
 
     pub fn update_incremental_record(&mut self, record: serde_json::Value) {
         let mut jobs = self.jobs.lock().unwrap();
-        let mut prev = jobs.by_uid_mut(self.uid).unwrap();
+        let prev = jobs.by_uid_mut(self.uid).unwrap();
         if prev.data.period.0 == 0 {
             prev.data.period.0 = self.run_started_at;
         }

resctl-demo/Cargo.toml

@@ -16,17 +16,17 @@ rd-util = { path = "../rd-util", version = "2.2.4" }
 rd-hashd-intf = { path = "../rd-hashd-intf", version = "2.2.4" }
 rd-agent-intf = { path = "../rd-agent-intf", version = "2.2.4" }
 
-anyhow = "^1.0"
-chrono = { version = "^0.4", features = ["serde"] }
-clap = "^2.33"
-crossbeam = "^0.8"
-cursive = { version = "^0.16", default-features = false, features = ["termion"] }
-cursive_buffered_backend = "^0.5"
-cursive-tabs = "^0.6"
-enum-iterator = "^0.7"
-env_logger = "^0.9"
-lazy_static = "^1.4"
-libc = "^0.2"
-log = "^0.4"
-tempfile = "^3.3"
-term_size = "^0.3"
+anyhow = "1.0"
+chrono = { version = "0.4", features = ["serde"] }
+clap = "2.33"
+crossbeam = "0.8"
+cursive = { version = "0.16", default-features = false, features = ["termion"] }
+cursive_buffered_backend = "0.5"
+cursive-tabs = "0.6"
+enum-iterator = "0.7"
+env_logger = "0.9"
+lazy_static = "1.4"
+libc = "0.2"
+log = "0.4"
+tempfile = "3.3"
+term_size = "0.3"

resctl-demo/src/agent.rs

@@ -203,7 +203,8 @@ impl AgentMinder {
             };
             if running {
                 let ts = AGENT_FILES.files.lock().unwrap().report.data.timestamp;
-                let updated_at = UNIX_EPOCH + Duration::from_nanos(ts.timestamp_nanos() as u64);
+                let updated_at =
+                    UNIX_EPOCH + Duration::from_nanos(ts.timestamp_nanos_opt().unwrap() as u64);
 
                 if updated_at > self.started_at {
                     self.update_state(true, cb_sink);