Merge pull request #22251 from JuliaLang/jb/operators

remove Operators module

Author: JeffBezanson

NEWS.md

@@ -101,6 +101,9 @@ Deprecated or removed
     which now require a module argument.
     And it caused the bugfix of other default arguments to use the Main module (including `whos`, `which`).
 
+  * The `Operators` module is deprecated. Instead, import required operators explicitly
+    from `Base`, e.g. `import Base: +, -, *, /` ([#22251]).
+
 
 Julia v0.6.0 Release Notes
 ==========================

base/dates/Dates.jl

@@ -32,7 +32,7 @@ for more information.
 """
 module Dates
 
-importall ..Base.Operators
+import ..Base: ==, div, fld, mod, rem, gcd, lcm, +, -, *, /, %
 import ..Base.broadcast
 
 using Base.Iterators

base/dates/periods.jl

@@ -65,7 +65,6 @@ Base.isless(x::P, y::P) where {P<:Period} = isless(value(x), value(y))
 Base.isless(x::Period, y::Period) = isless(promote(x, y)...)
 
 # Period Arithmetic, grouped by dimensionality:
-import Base: div, fld, mod, rem, gcd, lcm, +, -, *, /, %
 for op in (:+, :-, :lcm, :gcd)
     @eval ($op)(x::P, y::P) where {P<:Period} = P(($op)(value(x), value(y)))
 end

base/deprecated.jl

@@ -1421,6 +1421,19 @@ function LibGit2.set_remote_url(path::AbstractString, url::AbstractString; remot
     LibGit2.set_remote_url(path, remote, url)
 end
 
+module Operators
+    for op in [:!, :(!=), :(!==), :%, :&, :*, :+, :-, :/, ://, :<, :<:, :<<, :(<=),
+               :<|, :(==), :(===), :>, :>:, :(>=), :>>, :>>>, :\, :^, :colon,
+               :ctranspose, :getindex, :hcat, :hvcat, :setindex!, :transpose, :vcat,
+               :xor, :|, :|>, :~, :×, :÷, :∈, :∉, :∋, :∌, :∘, :√, :∛, :∩, :∪, :≠, :≤,
+               :≥, :⊆, :⊈, :⊊, :⊻, :⋅]
+        if isdefined(Base, op)
+            @eval Base.@deprecate_binding $op Base.$op
+        end
+    end
+end
+export Operators
+
 # END 0.7 deprecations
 
 # BEGIN 1.0 deprecations

base/exports.jl

@@ -4,7 +4,6 @@ export
 # Modules
     FFTW,
     Meta,
-    Operators,
     Pkg,
     LibGit2,
     StackTraces,

base/grisu/float.jl

@@ -28,6 +28,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import Base: -, *
+
 struct Float
     s::UInt64
     e::Int32

base/grisu/grisu.jl

@@ -2,8 +2,6 @@
 
 module Grisu
 
-importall ..Base.Operators
-
 export print_shortest
 export DIGITS, grisu
 

base/multidimensional.jl

@@ -6,7 +6,7 @@ module IteratorsMD
                  setindex!, IndexStyle, min, max, zero, one, isless, eachindex,
                  ndims, iteratorsize, convert
 
-    importall ..Base.Operators
+    import Base: +, -, *
     import Base: simd_outer_range, simd_inner_length, simd_index
     using Base: IndexLinear, IndexCartesian, AbstractCartesianIndex, fill_to_length, tail
 

base/operators.jl

@@ -902,74 +902,3 @@ julia> filter(!isalpha, str)
 ```
 """
 !(f::Function) = (x...)->!f(x...)
-
-# some operators not defined yet
-global //, >:, <|, hcat, hvcat, ⋅, ×, ∈, ∉, ∋, ∌, ⊆, ⊈, ⊊, ∩, ∪, √, ∛
-
-this_module = @__MODULE__
-baremodule Operators
-
-export
-    !,
-    !=,
-    !==,
-    ===,
-    xor,
-    %,
-    ÷,
-    &,
-    *,
-    +,
-    -,
-    /,
-    //,
-    <,
-    <:,
-    >:,
-    <<,
-    <=,
-    ==,
-    >,
-    >=,
-    ≥,
-    ≤,
-    ≠,
-    >>,
-    >>>,
-    \,
-    ^,
-    |,
-    |>,
-    <|,
-    ~,
-    ⋅,
-    ×,
-    ∈,
-    ∉,
-    ∋,
-    ∌,
-    ⊆,
-    ⊈,
-    ⊊,
-    ∩,
-    ∪,
-    √,
-    ∛,
-    ⊻,
-    ∘,
-    colon,
-    hcat,
-    vcat,
-    hvcat,
-    getindex,
-    setindex!,
-    transpose,
-    ctranspose
-
-import ..this_module: !, !=, xor, %, ÷, &, *, +, -,
-    /, //, <, <:, <<, <=, ==, >, >=, >>, >>>,
-    <|, |>, \, ^, |, ~, !==, ===, >:, colon, hcat, vcat, hvcat, getindex, setindex!,
-    transpose, ctranspose,
-    ≥, ≤, ≠, ⋅, ×, ∈, ∉, ∋, ∌, ⊆, ⊈, ⊊, ∩, ∪, √, ∛, ⊻, ∘
-
-end

base/pkg/resolve/fieldvalue.jl

@@ -3,7 +3,6 @@
 module FieldValues
 
 using ...VersionWeights
-importall .....Base.Operators
 
 export FieldValue, Field, validmax, secondmax
 

base/pkg/resolve/versionweight.jl

@@ -2,8 +2,6 @@
 
 module VersionWeights
 
-importall ....Base.Operators
-
 export VersionWeight
 
 struct HierarchicalValue{T}

base/sysimg.jl

@@ -447,6 +447,5 @@ include(Base, "precompile.jl")
 end # baremodule Base
 
 using Base
-importall Base.Operators
 
 Base.isfile("userimg.jl") && Base.include(Main, "userimg.jl")

doc/src/manual/functions.md

@@ -169,9 +169,6 @@ A few special expressions correspond to calls to functions with non-obvious name
 | `A[i]`            | [`getindex()`](@ref)   |
 | `A[i]=x`          | [`setindex!()`](@ref)  |
 
-These functions are included in the `Base.Operators` module even though they do not have operator-like
-names.
-
 ## [Anonymous Functions](@id man-anonymous-functions)
 
 Functions in Julia are [first-class objects](https://en.wikipedia.org/wiki/First-class_citizen):