Merge 05a3ea2 into f48af99

JuliaPhysics · Nov 24, 2019 · d7f146e · d7f146e
2 parents f48af99 + 05a3ea2
commit d7f146e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/conversions.jl b/src/conversions.jl
@@ -48,3 +48,9 @@ Base.promote_rule(::Type{Measurement{T}}, ::Type{S}) where {T<:AbstractFloat, S<
 Base.promote_rule(::Type{Measurement{T}},
                   ::Type{Measurement{S}}) where {T<:AbstractFloat, S<:AbstractFloat} =
     Measurement{promote_type(T, S)}
+
+# adaptation of JuliaLang/julia#30952
+@static if VERSION < v"1.3"
+    Base._range(a::T, step::T, ::Nothing, len::Integer) where {T<:Measurement} =
+        Base._rangestyle(Base.OrderStyle(T), Base.ArithmeticStyle(T), a, step, len)
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -783,3 +783,7 @@ end
 @testset "Plot recipes" begin
     include("plots.jl")
 end
+
+@testset "JuliaLang/julia#30944" begin
+    @test range(0±0, step=1±.1, length=10) isa StepRangeLen
+end