From b15178011bcd99521296021cd923f8a9b1c55c12 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Mon, 16 Oct 2023 16:03:53 -0700
Subject: [PATCH] clean up namespace

---
 nexus/inventory/src/builder.rs   | 10 +++++-----
 nexus/inventory/src/collector.rs |  2 +-
 nexus/inventory/src/lib.rs       |  2 --
 nexus/src/app/background/mod.rs  |  1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/nexus/inventory/src/builder.rs b/nexus/inventory/src/builder.rs
index 505a87ef45..aa69d2d9b5 100644
--- a/nexus/inventory/src/builder.rs
+++ b/nexus/inventory/src/builder.rs
@@ -4,19 +4,19 @@
 
 //! Interface for building [`Collection`] dynamically
 
-use crate::BaseboardId;
-use crate::Caboose;
-use crate::Collection;
-use crate::RotState;
-use crate::ServiceProcessor;
 use anyhow::anyhow;
 use chrono::DateTime;
 use chrono::Utc;
 use gateway_client::types::SpComponentCaboose;
 use gateway_client::types::SpState;
 use gateway_client::types::SpType;
+use nexus_types::inventory::BaseboardId;
+use nexus_types::inventory::Caboose;
 use nexus_types::inventory::CabooseFound;
 use nexus_types::inventory::CabooseWhich;
+use nexus_types::inventory::Collection;
+use nexus_types::inventory::RotState;
+use nexus_types::inventory::ServiceProcessor;
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 use std::sync::Arc;
diff --git a/nexus/inventory/src/collector.rs b/nexus/inventory/src/collector.rs
index 5be01d26e1..e281db3962 100644
--- a/nexus/inventory/src/collector.rs
+++ b/nexus/inventory/src/collector.rs
@@ -5,9 +5,9 @@
 //! Collection of inventory from Omicron components
 
 use crate::builder::CollectionBuilder;
-use crate::Collection;
 use anyhow::Context;
 use nexus_types::inventory::CabooseWhich;
+use nexus_types::inventory::Collection;
 use std::sync::Arc;
 use strum::IntoEnumIterator;
 
diff --git a/nexus/inventory/src/lib.rs b/nexus/inventory/src/lib.rs
index 7e47ab317d..6f6aff9af9 100644
--- a/nexus/inventory/src/lib.rs
+++ b/nexus/inventory/src/lib.rs
@@ -13,5 +13,3 @@ mod builder;
 mod collector;
 
 pub use collector::Collector;
-// XXX-remove this
-pub use nexus_types::inventory::*;
diff --git a/nexus/src/app/background/mod.rs b/nexus/src/app/background/mod.rs
index 337205cbd5..e1f474b41a 100644
--- a/nexus/src/app/background/mod.rs
+++ b/nexus/src/app/background/mod.rs
@@ -11,7 +11,6 @@ mod dns_servers;
 mod external_endpoints;
 mod init;
 mod inventory_collection;
-// mod inventory_write;
 mod status;
 
 pub use common::Driver;