chore: Fix some unstable lints (#971)

Fix some lints that appear when compiling on nightly.
These are mostly double-import warnings due to importing things already
included by `use super::*`.

hugr/src/algorithm/const_fold.rs

@@ -212,8 +212,8 @@ mod test {
 
     use super::*;
     use crate::extension::prelude::{sum_with_error, BOOL_T};
-    use crate::extension::{ExtensionRegistry, PRELUDE};
-    use crate::ops::{OpType, UnpackTuple};
+    use crate::extension::PRELUDE;
+    use crate::ops::UnpackTuple;
     use crate::std_extensions::arithmetic;
     use crate::std_extensions::arithmetic::conversions::ConvertOpDef;
     use crate::std_extensions::arithmetic::float_ops::FloatOps;

hugr/src/algorithm/nest_cfgs.rs

@@ -579,10 +579,10 @@ pub(crate) mod test {
     use crate::extension::{prelude::USIZE_T, ExtensionSet};
 
     use crate::hugr::views::RootChecked;
-    use crate::ops::handle::{BasicBlockID, ConstID, NodeHandle};
+    use crate::ops::handle::{ConstID, NodeHandle};
     use crate::ops::Value;
+    use crate::type_row;
     use crate::types::{FunctionType, Type};
-    use crate::{type_row, Hugr};
     const NAT: Type = USIZE_T;
 
     pub fn group_by<E: Eq + Hash + Ord, V: Eq + Hash>(h: HashMap<E, V>) -> HashSet<Vec<E>> {

hugr/src/builder/cfg.rs

@@ -400,7 +400,6 @@ impl BlockBuilder<Hugr> {
 
 #[cfg(test)]
 pub(crate) mod test {
-    use crate::builder::build_traits::HugrBuilder;
     use crate::builder::{DataflowSubContainer, ModuleBuilder};
 
     use crate::hugr::validate::InterGraphEdgeError;

hugr/src/builder/circuit.rs

@@ -241,7 +241,7 @@ mod test {
     use crate::{
         builder::{
             test::{build_main, NAT, QB},
-            Dataflow, DataflowSubContainer, Wire,
+            DataflowSubContainer,
         },
         extension::prelude::BOOL_T,
         ops::{custom::OpaqueOp, CustomOp},

hugr/src/builder/conditional.rs

@@ -207,14 +207,13 @@ impl CaseBuilder<Hugr> {
 mod test {
     use cool_asserts::assert_matches;
 
-    use crate::builder::{DataflowSubContainer, HugrBuilder, ModuleBuilder};
+    use crate::builder::{DataflowSubContainer, ModuleBuilder};
 
     use crate::{
         builder::{
             test::{n_identity, NAT},
             Dataflow,
         },
-        extension::ExtensionSet,
         ops::Value,
         type_row,
     };

hugr/src/builder/dataflow.rs

@@ -217,11 +217,7 @@ pub(crate) mod test {
     use crate::types::Type;
     use crate::utils::test_quantum_extension::h_gate;
     use crate::{
-        builder::{
-            test::{n_identity, BIT, NAT, QB},
-            BuildError,
-        },
-        extension::ExtensionSet,
+        builder::test::{n_identity, BIT, NAT, QB},
         type_row, Wire,
     };
 

hugr/src/builder/tail_loop.rs

@@ -100,7 +100,7 @@ mod test {
         extension::ExtensionSet,
         hugr::ValidationError,
         ops::Value,
-        type_row, Hugr,
+        type_row,
     };
 
     use super::*;

hugr/src/extension/infer/test.rs

@@ -4,10 +4,10 @@ use super::*;
 use crate::builder::{
     Container, DFGBuilder, Dataflow, DataflowHugr, DataflowSubContainer, HugrBuilder, ModuleBuilder,
 };
+use crate::extension::prelude::PRELUDE_REGISTRY;
 use crate::extension::prelude::QB_T;
 use crate::extension::ExtensionId;
-use crate::extension::{prelude::PRELUDE_REGISTRY, ExtensionSet};
-use crate::hugr::{Hugr, HugrMut, HugrView, NodeType};
+use crate::hugr::{Hugr, HugrMut, NodeType};
 use crate::macros::const_extension_ids;
 use crate::ops::custom::OpaqueOp;
 use crate::ops::{self, dataflow::IOTrait};

hugr/src/extension/prelude.rs

@@ -296,7 +296,6 @@ impl CustomConst for ConstError {
 mod test {
     use crate::{
         builder::{DFGBuilder, Dataflow, DataflowHugr},
-        types::FunctionType,
         Hugr, Wire,
     };
 

hugr/src/hugr.rs

@@ -353,6 +353,7 @@ mod test {
     fn impls_send_and_sync() {
         // Send and Sync are automatically impl'd by the compiler, if possible.
         // This test will fail to compile if that wasn't possible.
+        #[allow(dead_code)]
         trait Test: Send + Sync {}
         impl Test for Hugr {}
     }

hugr/src/hugr/rewrite/consts.rs

@@ -119,7 +119,6 @@ mod test {
             prelude::{ConstUsize, USIZE_T},
             PRELUDE_REGISTRY,
         },
-        hugr::HugrMut,
         ops::{handle::NodeHandle, MakeTuple, Value},
         type_row,
         types::FunctionType,

hugr/src/hugr/rewrite/insert_identity.rs

@@ -103,7 +103,7 @@ mod tests {
         algorithm::nest_cfgs::test::build_conditional_in_loop_cfg,
         extension::{prelude::QB_T, PRELUDE_REGISTRY},
         ops::handle::NodeHandle,
-        Hugr, HugrView,
+        Hugr,
     };
 
     #[rstest]

hugr/src/hugr/validate/test.rs

@@ -9,14 +9,14 @@ use crate::builder::{
 use crate::extension::prelude::{BOOL_T, PRELUDE, USIZE_T};
 use crate::extension::{Extension, ExtensionId, TypeDefBound, EMPTY_REG, PRELUDE_REGISTRY};
 use crate::hugr::hugrmut::sealed::HugrMutInternals;
-use crate::hugr::{HugrMut, NodeType};
+use crate::hugr::HugrMut;
 use crate::ops::dataflow::IOTrait;
-use crate::ops::{self, Noop, OpType, Value};
+use crate::ops::{self, Noop, Value};
 use crate::std_extensions::logic::test::{and_op, or_op};
 use crate::std_extensions::logic::{self, NotOp};
-use crate::types::type_param::{TypeArg, TypeArgError, TypeParam};
+use crate::types::type_param::{TypeArg, TypeArgError};
 use crate::types::{CustomType, FunctionType, PolyFuncType, Type, TypeBound, TypeRow};
-use crate::{type_row, Direction, IncomingPort, Node};
+use crate::{type_row, IncomingPort};
 
 const NAT: Type = crate::extension::prelude::USIZE_T;
 

hugr/src/hugr/views/descendants.rs

@@ -201,7 +201,6 @@ where
 pub(super) mod test {
     use crate::{
         builder::{Container, Dataflow, DataflowSubContainer, HugrBuilder, ModuleBuilder},
-        ops::handle::NodeHandle,
         type_row,
         types::{FunctionType, Type},
         utils::test_quantum_extension::h_gate,

hugr/src/hugr/views/sibling_subgraph.rs

@@ -698,7 +698,6 @@ mod tests {
             EMPTY_REG,
         },
         hugr::views::{HierarchyView, SiblingGraph},
-        hugr::HugrMut,
         ops::handle::{DfgID, FuncID, NodeHandle},
         std_extensions::logic::{test::and_op, NotOp},
         type_row,

hugr/src/ops/constant.rs

@@ -346,11 +346,10 @@ mod test {
             prelude::{ConstUsize, USIZE_CUSTOM_T, USIZE_T},
             ExtensionId, ExtensionRegistry, PRELUDE,
         },
-        ops::constant::CustomSerialized,
         std_extensions::arithmetic::float_types::{self, ConstF64, FLOAT64_TYPE},
         type_row,
         types::type_param::TypeArg,
-        types::{CustomType, FunctionType, Type, TypeBound, TypeRow},
+        types::{Type, TypeBound, TypeRow},
     };
     use cool_asserts::assert_matches;
     use rstest::{fixture, rstest};

hugr/src/std_extensions/collections.rs

@@ -290,15 +290,14 @@ impl ListOpInst {
 
 #[cfg(test)]
 mod test {
+    use crate::ops::OpTrait;
     use crate::{
         extension::{
             prelude::{ConstUsize, QB_T, USIZE_T},
-            ExtensionRegistry, PRELUDE,
+            PRELUDE,
         },
-        ops::OpTrait,
         std_extensions::arithmetic::float_types::{self, ConstF64, FLOAT64_TYPE},
-        types::{type_param::TypeArg, TypeRow},
-        Extension,
+        types::TypeRow,
     };
 
     use super::*;

hugr/src/types.rs

@@ -447,9 +447,7 @@ pub(crate) fn check_typevar_decl(
 #[cfg(test)]
 pub(crate) mod test {
     use super::*;
-    use crate::{extension::prelude::USIZE_T, ops::AliasDecl};
-
-    use crate::types::TypeBound;
+    use crate::extension::prelude::USIZE_T;
 
     #[test]
     fn construct() {