Use a codeunit type-assert that is easier for inference to elide (#37192

) Circumvents #37135
JuliaLang · Aug 25, 2020 · dbf5e00 · dbf5e00 · nanosoldier · Aug 25, 2020
1 parent 6aee988
commit dbf5e00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/base/regex.jl b/base/regex.jl
@@ -428,7 +428,7 @@ struct SubstitutionString{T<:AbstractString} <: AbstractString
 end
 
 ncodeunits(s::SubstitutionString) = ncodeunits(s.string)::Int
-codeunit(s::SubstitutionString) = codeunit(s.string)::Type{<:Union{UInt8, UInt16, UInt32}}
+codeunit(s::SubstitutionString) = codeunit(s.string)::CodeunitType
 codeunit(s::SubstitutionString, i::Integer) = codeunit(s.string, i)::Union{UInt8, UInt16, UInt32}
 isvalid(s::SubstitutionString, i::Integer) = isvalid(s.string, i)::Bool
 iterate(s::SubstitutionString, i::Integer...) = iterate(s.string, i...)::Union{Nothing,Tuple{AbstractChar,Int}}

diff --git a/base/strings/basic.jl b/base/strings/basic.jl
@@ -81,6 +81,8 @@ See also: [`ncodeunits`](@ref)
 """
 codeunit(s::AbstractString)
 
+const CodeunitType = Union{Type{UInt8},Type{UInt16},Type{UInt32}}
+
 """
  codeunit(s::AbstractString, i::Integer) -> Union{UInt8, UInt16, UInt32}
 
@@ -174,7 +176,7 @@ julia> sizeof("∀")
 3
 ```
 """
-sizeof(s::AbstractString) = ncodeunits(s)::Int * sizeof(codeunit(s)::Type{<:Union{UInt8,UInt16,UInt32}})
+sizeof(s::AbstractString) = ncodeunits(s)::Int * sizeof(codeunit(s)::CodeunitType)
 firstindex(s::AbstractString) = 1
 lastindex(s::AbstractString) = thisind(s, ncodeunits(s)::Int)
 isempty(s::AbstractString) = iszero(ncodeunits(s)::Int)
@@ -602,7 +604,7 @@ isascii(c::AbstractChar) = UInt32(c) < 0x80
 ## string map, filter ##
 
 function map(f, s::AbstractString)
- out = StringVector(max(4, sizeof(s)::Int÷sizeof(codeunit(s)::Type{<:Union{UInt8,UInt16,UInt32}})))
+ out = StringVector(max(4, sizeof(s)::Int÷sizeof(codeunit(s)::CodeunitType)))
  index = UInt(1)
  for c::AbstractChar in s
  c′ = f(c)

diff --git a/base/strings/substring.jl b/base/strings/substring.jl
@@ -62,7 +62,7 @@ function String(s::SubString{String})
 end
 
 ncodeunits(s::SubString) = s.ncodeunits
-codeunit(s::SubString) = codeunit(s.string)::Type{<:Union{UInt8, UInt16, UInt32}}
+codeunit(s::SubString) = codeunit(s.string)::CodeunitType
 length(s::SubString) = length(s.string, s.offset+1, s.offset+s.ncodeunits)
 
 function codeunit(s::SubString, i::Integer)