fixups

JuliaLang · Jun 1, 2020 · 9f5b535 · 9f5b535
1 parent a3d933b
commit 9f5b535
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/base/reinterpretarray.jl b/base/reinterpretarray.jl
@@ -54,8 +54,8 @@ StridedReshapedArray{T,N,A<:Union{DenseArray,StridedFastContiguousSubArray,Strid
 StridedSubArray{T,N,A<:Union{DenseArray,StridedReshapedArray,StridedReinterpretArray},
     I<:Tuple{Vararg{Union{RangeIndex, ReshapedUnitRange, AbstractCartesianIndex}}}} = SubArray{T,N,A,I}
 StridedArray{T,N} = Union{DenseArray{T,N}, StridedSubArray{T,N}, StridedReshapedArray{T,N}, StridedReinterpretArray{T,N}}
-StridedVector{T} = Union{DenseArray{T,1}, StridedSubArray{T,1}, StridedReshapedArray{T,1}, StridedReinterpretArray{T,1}}
-StridedMatrix{T} = Union{DenseArray{T,2}, StridedSubArray{T,2}, StridedReshapedArray{T,2}, StridedReinterpretArray{T,2}}
+StridedVector{T} = StridedArray{T,1}
+StridedMatrix{T} = StridedArray{T,2}
 StridedVecOrMat{T} = Union{StridedVector{T}, StridedMatrix{T}}
 
 # the definition of strides for Array{T,N} is tuple() if N = 0, otherwise it is

diff --git a/base/show.jl b/base/show.jl
@@ -557,7 +557,6 @@ function make_typealias(x::Type)
                         for p in xenv
                             applied = rewrap_unionall(applied, p)
                         end
-                        applied = rewrap_unionall(applied, alias)
                         has_free_typevars(applied) && continue
                         applied == x || continue # it couldn't figure out the parameter matching
                     elseif alias <: x
@@ -639,7 +638,6 @@ function make_typealiases(x::Type)
                     for p in xenv
                         applied = rewrap_unionall(applied, p)
                     end
-                    applied = rewrap_unionall(applied, alias)
                     has_free_typevars(applied) && continue
                     applied <: x || continue # parameter matching didn't make a subtype
                     print_without_params(x) && (env = Core.svec())