Merge pull request #11678 from JuliaLang/revert-10331-mb/colon-indexing

Move setindex! with Colon from array.jl to arraymath.jl
JuliaLang · Jun 12, 2015 · 064e96b · 064e96b
2 parents f5f4ea0 + 08b33b3
commit 064e96b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -343,20 +343,6 @@ function setindex!(A::Array, X::AbstractArray, I::AbstractVector{Int})
     end
     return A
 end
-function setindex!(A::Array, x, ::Colon)
-    for i in 1:length(A)
-        @inbounds A[i] = x
-    end
-    return A
-end
-function setindex!(A::Array, X::AbstractArray, ::Colon)
-    setindex_shape_check(X, length(A))
-    i = 0
-    for x in X
-        @inbounds A[i+=1] = x
-    end
-    return A
-end
 
 # Faster contiguous setindex! with copy!
 setindex!{T}(A::Array{T}, X::Array{T}, I::UnitRange{Int}) = (checkbounds(A, I); unsafe_setindex!(A, X, I))

diff --git a/base/intset.jl b/base/intset.jl
@@ -113,7 +113,7 @@ symdiff(s1::IntSet, s2::IntSet) =
     (s1.limit >= s2.limit ? symdiff!(copy(s1), s2) : symdiff!(copy(s2), s1))
 
 function empty!(s::IntSet)
-    s.bits[:] = 0
+    fill!(s.bits, 0)
     return s
 end