update CI and REQUIRE

Author: mauro3

.travis.yml

@@ -3,7 +3,6 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
   - nightly
 # matrix:
 #   allow_failures:

REQUIRE

@@ -1,3 +1,2 @@
-julia 0.6
-Compat 0.26.0
+julia 0.7
 MacroTools 0.3.2

appveyor.yml

@@ -1,7 +1,5 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

src/SimpleTraits.jl

@@ -2,7 +2,6 @@ __precompile__()
 
 module SimpleTraits
 using MacroTools
-using Compat
 const curmod = nameof(@__MODULE__)
 
 import InteractiveUtils
@@ -189,7 +188,7 @@ end
 dispatch_cache = Dict()  # to ensure that the trait-dispatch function is defined only once per pair
 let
     global traitfn
-    function traitfn(tfn, cur_module)
+    function traitfn(tfn, macro_module)
         # Need
         # f(x::X,Y::Y) where {X,Y} = f(trait(Tr1{X,Y}), x, y)
         # f(::False, x, y)= ...
@@ -338,7 +337,7 @@ let
         end
         # Create the trait dispatch function
         ex = fn
-        key = (cur_module, fname, typs0, strip_kw(args0), trait0_opposite)
+        key = (macro_module, fname, typs0, strip_kw(args0), trait0_opposite)
         if !(key ∈ keys(dispatch_cache)) # define trait dispatch function
             if !haskwargs
                 ex = if oldfn_syntax
@@ -413,11 +412,7 @@ Defines a function dispatching on a trait. Examples:
 Note that the second example is just syntax sugar for `@traitfn f(x::X,y::Y) where {X,Y; Not{Tr1{X,Y}}} = ...`.
 """
 macro traitfn(tfn)
-    @static if isdefined(Base, Symbol("@__MODULE__"))
-        esc(traitfn(tfn, __module__))
-    else
-        esc(traitfn(tfn, current_module()))
-    end
+    esc(traitfn(tfn, __module__))
 end
 
 ######

test/base-traits-inference.jl

@@ -5,7 +5,7 @@
 # Dict with base-traits to check using value[1] as type and value[2]
 # as number of lines allowed in llvm code
 cutoff = 5
-basetrs = [VERSION<v"0.7-" ? :IsLeafType=>:Int : :IsConcrete=>:Int,
+basetrs = [#VERSION<v"0.7-" ? :IsLeafType=>:Int : :IsConcrete=>:Int,
            :IsBits=>:Int,
            :IsImmutable=>:Int,
            :IsContiguous=>:(SubArray{Int64,1,Array{Int64,1},Tuple{Array{Int64,1}},false}),
@@ -15,7 +15,10 @@ basetrs = [VERSION<v"0.7-" ? :IsLeafType=>:Int : :IsConcrete=>:Int,
            :IsCallable=>:(typeof(sin)),
            :IsIterator=>:(Dict{Int,Int})]
 
-# for (bt, tp) in basetrs
-#     @show bt
-#     @test @eval @check_fast_traitdispatch $bt $tp true
-# end
+for (bt, tp) in basetrs
+    if bt==:IsConcrete
+        @test_broken @eval @check_fast_traitdispatch $bt $tp true
+    else
+        @test @eval @check_fast_traitdispatch $bt $tp true
+    end
+end

test/base-traits.jl

@@ -1,5 +1,4 @@
 using SimpleTraits.BaseTraits
-using Compat: view
 
 @test istrait(IsAnything{Any})
 @test istrait(IsAnything{Union{}})