From 81bdf3e3e142f2724037057e9c9d96ef65a7fdf3 Mon Sep 17 00:00:00 2001
From: Charles Kawczynski <kawczynski.charles@gmail.com>
Date: Mon, 11 Nov 2024 11:10:42 -0500
Subject: [PATCH] Qualify IntervalSets and OrderedCollections

---
 src/Domains/Domains.jl                            | 10 +++++-----
 test/Fields/convergence_field_integrals.jl        |  2 +-
 test/Fields/unit_field.jl                         |  2 +-
 test/Fields/utils_field_multi_broadcast_fusion.jl |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Domains/Domains.jl b/src/Domains/Domains.jl
index 5336f30a2c..8c90c03a26 100644
--- a/src/Domains/Domains.jl
+++ b/src/Domains/Domains.jl
@@ -1,7 +1,7 @@
 module Domains
 
 import ..Geometry: Geometry, float_type
-using IntervalSets
+import IntervalSets
 export RectangleDomain
 
 """
@@ -62,7 +62,7 @@ function IntervalDomain(
     end
     IntervalDomain(promote(coord_min, coord_max)..., boundary_names)
 end
-IntervalDomain(coords::ClosedInterval; kwargs...) =
+IntervalDomain(coords::IntervalSets.ClosedInterval; kwargs...) =
     IntervalDomain(coords.left, coords.right; kwargs...)
 
 """
@@ -119,7 +119,7 @@ boundary_names(domain::RectangleDomain) = unique(
 )::Vector{Symbol}
 
 """
-    RectangleDomain(x1::ClosedInterval, x2::ClosedInterval;
+    RectangleDomain(x1::IntervalSets.ClosedInterval, x2::IntervalSets.ClosedInterval;
         x1boundary::Tuple{Symbol,Symbol},
         x2boundary::Tuple{Symbol,Symbol},
         x1periodic = false,
@@ -130,8 +130,8 @@ Construct a `RectangularDomain` in the horizontal.
 If a given x1 or x2 boundary is not periodic, then `x1boundary` or `x2boundary` boundary name keyword arguments must be supplied.
 """
 function RectangleDomain(
-    x1::ClosedInterval{X1CT},
-    x2::ClosedInterval{X2CT};
+    x1::IntervalSets.ClosedInterval{X1CT},
+    x2::IntervalSets.ClosedInterval{X2CT};
     x1periodic = false,
     x2periodic = false,
     x1boundary::BCTagType = nothing,
diff --git a/test/Fields/convergence_field_integrals.jl b/test/Fields/convergence_field_integrals.jl
index 4dcf0c1842..e20b99b106 100644
--- a/test/Fields/convergence_field_integrals.jl
+++ b/test/Fields/convergence_field_integrals.jl
@@ -8,7 +8,7 @@ using JET
 
 using ClimaComms
 ClimaComms.@import_required_backends
-using OrderedCollections
+import OrderedCollections
 using StaticArrays, IntervalSets
 import ClimaCore
 import ClimaCore.Utilities: PlusHalf
diff --git a/test/Fields/unit_field.jl b/test/Fields/unit_field.jl
index 805b4ef8cd..c7d0f60138 100644
--- a/test/Fields/unit_field.jl
+++ b/test/Fields/unit_field.jl
@@ -8,7 +8,7 @@ using JET
 
 using ClimaComms
 ClimaComms.@import_required_backends
-using OrderedCollections
+import OrderedCollections
 using StaticArrays, IntervalSets
 import ClimaCore
 import ClimaCore.InputOutput
diff --git a/test/Fields/utils_field_multi_broadcast_fusion.jl b/test/Fields/utils_field_multi_broadcast_fusion.jl
index 35abea33be..424cadaf06 100644
--- a/test/Fields/utils_field_multi_broadcast_fusion.jl
+++ b/test/Fields/utils_field_multi_broadcast_fusion.jl
@@ -10,7 +10,7 @@ using BenchmarkTools
 
 using ClimaComms
 ClimaComms.@import_required_backends
-using OrderedCollections
+import OrderedCollections
 using StaticArrays, IntervalSets
 import ClimaCore
 import ClimaCore.Utilities: PlusHalf