From 4795b3653fb3442ea916070132335a6ff1d4ff9c Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Tue, 17 Oct 2023 16:52:08 -0700
Subject: [PATCH] clippy

---
 dev-tools/omdb/src/bin/omdb/db.rs              | 2 +-
 nexus/db-queries/src/db/datastore/inventory.rs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-tools/omdb/src/bin/omdb/db.rs b/dev-tools/omdb/src/bin/omdb/db.rs
index 386d79a8e6..0e193e4f94 100644
--- a/dev-tools/omdb/src/bin/omdb/db.rs
+++ b/dev-tools/omdb/src/bin/omdb/db.rs
@@ -1650,7 +1650,7 @@ async fn inv_collection_print(
     );
     println!(
         "done:       {}",
-        humantime::format_rfc3339_millis(c.time_done.into()).to_string()
+        humantime::format_rfc3339_millis(c.time_done.into())
     );
 
     Ok(())
diff --git a/nexus/db-queries/src/db/datastore/inventory.rs b/nexus/db-queries/src/db/datastore/inventory.rs
index 547aa7d2f9..6d42d667cb 100644
--- a/nexus/db-queries/src/db/datastore/inventory.rs
+++ b/nexus/db-queries/src/db/datastore/inventory.rs
@@ -527,9 +527,7 @@ impl DataStore {
             )
             .load_async(&*conn)
             .await
-            .map_err(|e| {
-                public_error_from_diesel(e.into(), ErrorHandler::Server)
-            })
+            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))
             .internal_context("listing oldest collections")?;
 
         if u32::try_from(candidates.len()).unwrap() <= nkeep {