From ec1062539697ddd82c38a368337b4b94f744c0f7 Mon Sep 17 00:00:00 2001
From: Martin Holters <martin.holters@hsu-hh.de>
Date: Wed, 6 Jul 2016 15:55:02 +0200
Subject: [PATCH 1/2] Use promote_op in SparseMatrixCSC operators

---
 base/sparse/sparse.jl       |  4 ++--
 base/sparse/sparsematrix.jl | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/base/sparse/sparse.jl b/base/sparse/sparse.jl
index 7a7a5a82fc905..6409eb18c9a5b 100644
--- a/base/sparse/sparse.jl
+++ b/base/sparse/sparse.jl
@@ -2,7 +2,7 @@
 
 module SparseArrays
 
-using Base: ReshapedArray, setindex_shape_check, to_shape
+using Base: ReshapedArray, promote_op, setindex_shape_check, to_shape
 using Base.Sort: Forward
 using Base.LinAlg: AbstractTriangular, PosDefException
 
@@ -26,7 +26,7 @@ import Base: @get!, acos, acosd, acot, acotd, acsch, asech, asin, asind, asinh,
     rotl90, rotr90, round, scale!, setindex!, similar, size, transpose, tril,
     triu, vcat, vec, permute!
 
-import Base.Broadcast: eltype_plus, broadcast_shape
+import Base.Broadcast: broadcast_shape
 
 export AbstractSparseArray, AbstractSparseMatrix, AbstractSparseVector,
     SparseMatrixCSC, SparseVector, blkdiag, dense, droptol!, dropzeros!, dropzeros, etree,
diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
index 62d50096a880e..3c0c5c47e5a92 100644
--- a/base/sparse/sparsematrix.jl
+++ b/base/sparse/sparsematrix.jl
@@ -1666,13 +1666,7 @@ broadcast_zpreserving{Tv,Ti}(f::Function, A_1::Union{Array,BitArray,Number}, A_2
 
 ## Binary arithmetic and boolean operators
 
-for (op, pro) in ((+,   :eltype_plus),
-                  (-,   :eltype_plus),
-                  (min, :promote_eltype),
-                  (max, :promote_eltype),
-                  (&,   :promote_eltype),
-                  (|,   :promote_eltype),
-                  ($,   :promote_eltype))
+for op in (+, -, min, max, &, |, $)
     body = gen_broadcast_body_sparse(op, true)
     OP = Symbol(string(op))
     @eval begin
@@ -1680,7 +1674,7 @@ for (op, pro) in ((+,   :eltype_plus),
             if size(A_1,1) != size(A_2,1) || size(A_1,2) != size(A_2,2)
                 throw(DimensionMismatch(""))
             end
-            Tv = ($pro)(A_1, A_2)
+            Tv = promote_op($op, Tv1, Tv2)
             B =  spzeros(Tv, promote_type(Ti1, Ti2), to_shape(broadcast_shape(A_1, A_2)))
             $body
             B
@@ -1723,10 +1717,10 @@ end # macro
 (.^)(A::Array, B::SparseMatrixCSC) = (.^)(A, full(B))
 
 .+{Tv1,Ti1,Tv2,Ti2}(A_1::SparseMatrixCSC{Tv1,Ti1}, A_2::SparseMatrixCSC{Tv2,Ti2}) =
-   broadcast!(+, spzeros(eltype_plus(A_1, A_2), promote_type(Ti1, Ti2), to_shape(broadcast_shape(A_1, A_2))), A_1, A_2)
+    broadcast!(+, spzeros(promote_op(+, Tv1, Tv2), promote_type(Ti1, Ti2), to_shape(broadcast_shape(A_1, A_2))), A_1, A_2)
 
 function .-{Tva,Tia,Tvb,Tib}(A::SparseMatrixCSC{Tva,Tia}, B::SparseMatrixCSC{Tvb,Tib})
-    broadcast!(-, spzeros(eltype_plus(A, B), promote_type(Tia, Tib), to_shape(broadcast_shape(A, B))), A, B)
+    broadcast!(-, spzeros(promote_op(-, Tva, Tvb), promote_type(Tia, Tib), to_shape(broadcast_shape(A, B))), A, B)
 end
 
 ## element-wise comparison operators returning SparseMatrixCSC ##

From 04aac319f1fab39d3d39d34af3646f55d34bac1b Mon Sep 17 00:00:00 2001
From: Martin Holters <martin.holters@hsu-hh.de>
Date: Wed, 13 Jul 2016 09:45:37 +0200
Subject: [PATCH 2/2] Remove eltype_plus

---
 base/broadcast.jl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/base/broadcast.jl b/base/broadcast.jl
index f3eebb2c0cac3..d7e11afcd1a9d 100644
--- a/base/broadcast.jl
+++ b/base/broadcast.jl
@@ -271,9 +271,6 @@ end
 
 ## elementwise operators ##
 
-# should this be deprecated? Only use in Base is in sparsematrix.jl
-eltype_plus(As::AbstractArray...) = promote_eltype_op(+, As...)
-
 for op in (:÷, :%, :<<, :>>, :-, :/, :\, ://, :^)
     @eval $(Symbol(:., op))(A::AbstractArray, B::AbstractArray) = broadcast($(op), A, B)
 end