Clean up merge

Author: MilesCranmer

src/constants.jl

@@ -1,12 +1,11 @@
 module Constants
 
-import ..DEFAULT_QUANTITY_TYPE
 import ..Quantity
 import ..Units as U
-import ..Units: _add_prefixes
+import ..Units: _add_prefixes, DEFAULT_UNIT_TYPE
 
 const _CONSTANT_SYMBOLS = Symbol[]
-const _CONSTANT_VALUES = DEFAULT_QUANTITY_TYPE[]
+const _CONSTANT_VALUES = DEFAULT_UNIT_TYPE[]
 
 macro register_constant(name, value)
     return esc(_register_constant(name, value))
@@ -20,7 +19,7 @@ end
 function _register_constant(name::Symbol, value)
     s = string(name)
     return quote
-        const $name = $value
+        const $name = convert(DEFAULT_UNIT_TYPE, $value)
         push!(_CONSTANT_SYMBOLS, Symbol($s))
         push!(_CONSTANT_VALUES, $name)
     end
@@ -87,7 +86,7 @@ end
 )
 
 # Measured
-@register_constant alpha DEFAULT_QUANTITY_TYPE(7.2973525693e-3)
+@register_constant alpha DEFAULT_UNIT_TYPE(7.2973525693e-3)
 @register_constant u 1.66053906660e-27 * U.kg
 @register_constant G 6.67430e-11 * U.m^3 / (U.kg * U.s^2)
 @register_constant mu_0 4π * alpha * hbar / (e^2 * c)

src/lazy_float.jl

@@ -12,7 +12,8 @@ Base.convert(::Type{LazyFloat64}, x::LazyFloat64) = x
 Base.convert(::Type{LazyFloat64}, x::FixedRational) = LazyFloat64(convert(Float64, x))
 Base.convert(::Type{LazyFloat64}, x::Number) = LazyFloat64(x)
 Base.convert(::Type{T}, x::LazyFloat64) where {T<:Number} = convert(T, float(x))
-Base.promote_rule(::Type{LazyFloat64}, ::Type{T}) where {T} = T
+Base.promote_rule(::Type{LazyFloat64}, ::Type{T}) where {T<:AbstractFloat} = T
+Base.promote_rule(::Type{LazyFloat64}, ::Type{T}) where {T} = promote_type(Float64, T)
 
 (::Type{T})(x::LazyFloat64) where {T<:Number} = T(float(x))
 

src/units.jl

@@ -7,7 +7,7 @@ import ..Quantity
 import ..LazyFloat64
 
 const DEFAULT_UNIT_BASE_TYPE = LazyFloat64
-const DEFAULT_UNIT_TYPE = Quantity{DEFAULT_UNIT_TYPE,DEFAULT_DIM_TYPE}
+const DEFAULT_UNIT_TYPE = Quantity{DEFAULT_UNIT_BASE_TYPE,DEFAULT_DIM_TYPE}
 
 const _UNIT_SYMBOLS = Symbol[]
 const _UNIT_VALUES = DEFAULT_UNIT_TYPE[]