Reduce div definition to clean up ambiguities

Author: MilesCranmer

src/disambiguities.jl

@@ -12,9 +12,3 @@ Base.:*(l::AbstractDimensions, r::Number) = error("Please use an `UnionAbstractQ
 Base.:*(l::Number, r::AbstractDimensions) = error("Please use an `UnionAbstractQuantity` for multiplication. You used multiplication on types: $(typeof(l)) and $(typeof(r)).")
 Base.:/(l::AbstractDimensions, r::Number) = error("Please use an `UnionAbstractQuantity` for division. You used division on types: $(typeof(l)) and $(typeof(r)).")
 Base.:/(l::Number, r::AbstractDimensions) = error("Please use an `UnionAbstractQuantity` for division. You used division on types: $(typeof(l)) and $(typeof(r)).")
-
-if VERSION < v"1.7"
-    @eval function Base.div(x::DynamicQuantities.AbstractGenericQuantity{T}, y::T) where {T}
-        return new_quantity(typeof(x), div(ustrip(x), y), dimension(x))
-    end
-end

src/math.jl

@@ -6,11 +6,11 @@ for (type, base_type, _) in ABSTRACT_QUANTITY_TYPES
 
         Base.:*(l::$type, r::$base_type) = new_quantity(typeof(l), ustrip(l) * r, dimension(l))
         Base.:/(l::$type, r::$base_type) = new_quantity(typeof(l), ustrip(l) / r, dimension(l))
-        Base.div(x::$type, y::$base_type, r::RoundingMode=RoundToZero) = new_quantity(typeof(x), div(ustrip(x), y, r), dimension(x))
+        Base.div(x::$type, y::Number, r::RoundingMode=RoundToZero) = new_quantity(typeof(x), div(ustrip(x), y, r), dimension(x))
 
         Base.:*(l::$base_type, r::$type) = new_quantity(typeof(r), l * ustrip(r), dimension(r))
         Base.:/(l::$base_type, r::$type) = new_quantity(typeof(r), l / ustrip(r), inv(dimension(r)))
-        Base.div(x::$base_type, y::$type, r::RoundingMode=RoundToZero) = new_quantity(typeof(y), div(x, ustrip(y), r), inv(dimension(y)))
+        Base.div(x::Number, y::$type, r::RoundingMode=RoundToZero) = new_quantity(typeof(y), div(x, ustrip(y), r), inv(dimension(y)))
 
         Base.:*(l::$type, r::AbstractDimensions) = new_quantity(typeof(l), ustrip(l), dimension(l) * r)
         Base.:/(l::$type, r::AbstractDimensions) = new_quantity(typeof(l), ustrip(l), dimension(l) / r)

test/unittests.jl

@@ -757,16 +757,6 @@ end
     y = x ^ (3//2)
     @test y == Quantity(1.0, length=3//2)
     @test typeof(y) == Quantity{Float64,DEFAULT_DIM_TYPE}
-
-    VERSION < v"1.7" && for I in (Int64, UInt64)
-        x = GenericQuantity{I}(1u"km/s")
-        a = (
-            I <: Signed ? 
-            Base.MultiplicativeInverses.SignedMultiplicativeInverse :
-            Base.MultiplicativeInverses.UnsignedMultiplicativeInverse
-        )(I(3))
-        @test div(x, a) == GenericQuantity{I}(333u"m/s")
-    end
 end
 
 for Q in (Quantity, GenericQuantity)