Skip to content

Commit

Permalink
Update base/array.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
vtjnash committed Feb 28, 2022
1 parent e516597 commit 5fa4c29
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion base/array.jl
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ oneunit(x::AbstractMatrix{T}) where {T} = _one(oneunit(T), x)
convert(::Type{T}, a::AbstractArray) where {T<:Array} = a isa T ? a : T(a)
convert(::Type{Union{}}, a::AbstractArray) = throw(MethodError(convert, (Union{}, a)))

promote_rule(a::Type{<:Array{T,n}}, b::Type{<:Array{S,n}}) where {T,n,S} = el_same(promote_type(T, S), a, b)
promote_rule(a::Type{Array{T,n}}, b::Type{Array{S,n}}) where {T,n,S} = el_same(promote_type(T,S), a, b)

## Constructors ##

Expand Down

0 comments on commit 5fa4c29

Please sign in to comment.