make non-Bool any and all deprecation depend on values instead of…

… eltype
JuliaLang · Mar 13, 2016 · 06c93ce · 06c93ce
1 parent f07485f
commit 06c93ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -804,17 +804,17 @@ nonboolean_warning(f, op, status) = """
 """
 
 
-@noinline function nonboolean_any(itr)
-    depwarn(nonboolean_warning(:any, :|, "deprecated"), :nonboolean_any)
-    #throw(ArgumentError(nonboolean_warning(:any, :|, "not supported")))
-    reduce(|, itr)
+@noinline function or_bool_only(a, b)
+    depwarn(nonboolean_warning(:any, :|, "deprecated"), :or_bool_only)
+    a|b
 end
+or_bool_only(a::Bool, b::Bool) = a|b
 
-@noinline function nonboolean_all(itr)
-    depwarn(nonboolean_warning(:all, :&, "deprecated"), :nonboolean_all)
-    #throw(ArgumentError(nonboolean_warning(:all, :&, "not supported")))
-    reduce(&, itr)
+@noinline function and_bool_only(a, b)
+    depwarn(nonboolean_warning(:all, :&, "deprecated"), :and_bool_only)
+    a&b
 end
+and_bool_only(a::Bool, b::Bool) = a&b
 
 @deprecate iseltype(x,T)  eltype(x) <: T
 

diff --git a/base/reduce.jl b/base/reduce.jl
@@ -363,14 +363,14 @@ any(f::Predicate, itr) = mapreduce_sc_impl(f, OrFun(), itr)
 any(f::IdFun,     itr) =
     eltype(itr) <: Bool ?
         mapreduce_sc_impl(f, OrFun(), itr) :
-        nonboolean_any(itr)
+        reduce(or_bool_only, itr)
 
 all(f::Any,       itr) = all(Predicate(f), itr)
 all(f::Predicate, itr) = mapreduce_sc_impl(f, AndFun(), itr)
 all(f::IdFun,     itr) =
     eltype(itr) <: Bool ?
         mapreduce_sc_impl(f, AndFun(), itr) :
-        nonboolean_all(itr)
+        reduce(and_bool_only, itr)
 
 ## in & contains