remove some findfirst methods

Author: Michael Abbott

src/lookup.jl

@@ -88,8 +88,22 @@ findindex(a::Union{AbstractArray, Base.Generator}, r::AbstractArray) =
 
 findindex(f::Function, r::AbstractArray) = findall(f, r)
 
-# It's possible this should be a method of to_indices or one of its friends?
-# https://docs.julialang.org/en/v1/base/arrays/#Base.to_indices
+# Faster than Base.findfirst(==(i), 1:10) etc:
+
+findindex(i::Int, r::Base.OneTo{Int}) = 1 <= i <= r.stop ? eq.x : nothing
+
+findindex(i::Int, r::AbstractUnitRange) = first(r) <= i <= last(r) ? 1+Int(i - first(r)) : nothing
+
+# Faster than Base.findall(==(i), 1:10) etc:
+
+function findindex(eq::Base.Fix2{Union{typeof(==),typeof(isequal)},Int}, r::Base.OneTo{Int})
+    1 <= eq.x <= r.stop ? (eq.x:eq.x) : (1:0)
+end
+
+function findindex(eq::Base.Fix2{Union{typeof(==),typeof(isequal)},Int}, r::AbstractUnitRange)
+    val = 1 + Int(eq.x - first(r))
+    first(r) <= eq.x <= last(r) ? (val:val) : (1:0)
+end
 
 
 """

src/notpiracy.jl

@@ -22,13 +22,14 @@ map(f, t::Tuple, r::Base.RefValue) = error("ref second") # Ref(f(first(t), r[]))
 
 =#
 
-using Compat # 2.0 hasfield + 3.1 filter
+# using Compat # 2.0 hasfield + 3.1 filter
 
 #===== Speeding up with same results =====#
 
-findfirst(args...) = Base.findfirst(args...)
+# findfirst(args...) = Base.findfirst(args...)
 findall(args...) = Base.findall(args...)
 
+#=
 for equal in (isequal, Base.:(==))
     @eval begin
 
@@ -53,6 +54,7 @@ for equal in (isequal, Base.:(==))
 
     end
 end
+=#
 
 findall(eq::Base.Fix2{typeof(<=),Int}, r::Base.OneTo{Int}) =
     eq.x < 1 ? Base.OneTo(0) :

test/_notpiracy.jl

@@ -28,7 +28,8 @@ if VERSION >= v"1.2" # <(3) doesn't exist on 1.1, but Base.Fix2 is fine
             @test AxisKeys.findfirst(==(x), r) == findfirst(==(x), collect(r))
             @test AxisKeys.findfirst(isequal(x), r) == findfirst(isequal(x), collect(r))
 
-            for op in (isequal, Base.:(==), Base.:<, Base.:<=, Base.:>, Base.:>=)
+            # for op in (isequal, Base.:(==), Base.:<, Base.:<=, Base.:>, Base.:>=)
+            for op in (Base.:<, Base.:<=, Base.:>, Base.:>=)
 
                 @test AxisKeys.findall(op(x), r) == Base.findall(op(x), collect(r))
                 @test AxisKeys.findall(op(x), r) isa AbstractRange