clean up namespace

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;

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;
 

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::*;

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;