Update Rust version to 1.73.0 (#371)

TraceMachina · Nov 3, 2023 · 56eda36 · 56eda36
1 parent 8e234c5
commit 56eda36
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "06decb60a16dacd7da4f3d95134612ca0e1ad83d6cea6622b24d9a3fe086c0ec",
+  "checksum": "ffa058436431ad11db44bfbd1a61c7e419838e474661896794dc25b1d63f9993",
   "crates": {
     "addr2line 0.21.0": {
       "name": "addr2line",

diff --git a/WORKSPACE b/WORKSPACE
@@ -32,7 +32,7 @@ load("//tools:cargo_shared.bzl", "PACKAGES", "RUST_EDITION")
 rust_register_toolchains(
     edition = RUST_EDITION,
     versions = [
-        "1.70.0",
+        "1.73.0",
         "nightly/2023-07-15",
     ],
 )

diff --git a/cas/cas_main.rs b/cas/cas_main.rs
@@ -518,7 +518,7 @@ async fn inner_main(cfg: CasConfig, server_start_timestamp: u64) -> Result<(), B
     {
         // We start workers after our TcpListener is setup so if our worker connects to one
         // of these services it will be able to connect.
-        let worker_cfgs = cfg.workers.unwrap_or(vec![]);
+        let worker_cfgs = cfg.workers.unwrap_or_default();
         let mut root_metrics_registry_guard = root_metrics_registry.lock().await;
         let root_worker_metrics = root_metrics_registry_guard.sub_registry_with_prefix("workers");
         let mut worker_names = HashSet::with_capacity(worker_cfgs.len());

diff --git a/cas/scheduler/action_messages.rs b/cas/scheduler/action_messages.rs
@@ -253,15 +253,7 @@ impl Ord for ActionInfo {
 
 impl PartialOrd for ActionInfo {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let cmp = self
-            .priority
-            .cmp(&other.priority)
-            .then_with(|| other.insert_timestamp.cmp(&self.insert_timestamp))
-            .then_with(|| self.salt().cmp(other.salt()));
-        if cmp == Ordering::Equal {
-            return None;
-        }
-        Some(cmp)
+        Some(self.cmp(other))
     }
 }
 

diff --git a/util/common.rs b/util/common.rs
@@ -99,11 +99,7 @@ impl Ord for DigestInfo {
 
 impl PartialOrd for DigestInfo {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let cmp = self.cmp(other);
-        if cmp == Ordering::Equal {
-            return None;
-        }
-        Some(cmp)
+        Some(self.cmp(other))
     }
 }