Get things working on v0.5 (#212)

- Export complement if not available in Base
- Adjust exception type that change between 0.4 and 0.5
- primes was moved to the Primes package

src/int_set.jl

@@ -5,8 +5,11 @@ import Base: similar, copy, copy!, eltype, push!, pop!, delete!, shift!,
  setdiff, setdiff!, symdiff, symdiff!, in, start, next, done,
  last, length, show, hash, issubset, ==, <=, <, unsafe_getindex, 
  unsafe_setindex!, findnextnot, first
-# These names will be removed from Base in the future:
-import Base: complement, complement!
+if !isdefined(Base, :complement)
+ export complement, complement!
+else
+ import Base: complement, complement!
+end
 
 type IntSet
  bits::BitVector

test/REQUIRE

@@ -1 +1,2 @@
 Compat 0.7.16
+Primes 0.1.1

test/runtests.jl

@@ -2,6 +2,7 @@ using Base.Test
 using DataStructures
 const IntSet = DataStructures.IntSet
 import Compat: String
+using Primes
 
 tests = ["int_set",
  "deque",

test/test_circular_buffer.jl

@@ -5,7 +5,12 @@ using Base.Test
 cb = CircularBuffer{Int}(5)
 @test length(cb) == 0
 @test capacity(cb) == 5
-@test_throws ArgumentError first(cb)
+# throws ArgumentError on v0.4 and BoundsError on v0.5 (diverged at 0.5.0-dev+5230)
+if VERSION >= v"0.5.0-dev+5230"
+ @test_throws BoundsError first(cb)
+else
+ @test_throws ArgumentError first(cb)
+end
 @test isempty(cb) == true
 @test isfull(cb) == false
 

test/test_multi_dict.jl

@@ -31,8 +31,10 @@ d = MultiDict{Char,Int}()
 
 @test_throws KeyError d['c'] == 1
 insert!(d, 'c', 1)
-@test collect(keys(d)) == ['c', 'a']
-@test collect(values(d)) == Array{Int,1}[[1],[1,2,3]]
+
+# order changed from v0.4 to v0.5
+@test collect(keys(d)) == ['c', 'a'] || collect(keys(d)) == ['a', 'c']
+@test collect(values(d)) == Array{Int,1}[[1],[1,2,3]] || collect(values(d)) == Array{Int,1}[[1,2,3], [1]]
 
 @test get(d, 'a', 0) == [1,2,3]
 @test get(d, 'b', 0) == 0
@@ -45,7 +47,11 @@ insert!(d, 'c', 1)
 @test copy(d) == d
 @test similar(d) == MultiDict{Char,Int}()
 
-@test [kv for kv in d] == [Pair('c', [1]), Pair('a', [1,2,3])]
+# order changed from v0.4 to v0.5
+let dict = [kv for kv in d]
+ @test dict == [Pair('c', [1]), Pair('a', [1,2,3])] ||
+ dict == [Pair('a', [1,2,3]), Pair('c', [1])]
+end
 
 @test in(('c', 1), d)
 @test in(('a', 1), d)

test/test_ordered_dict.jl

@@ -124,8 +124,10 @@ let
  @test get_KeyError
 end
 
-_d = OrderedDict([("a", 0)])
-@test isa([k for k in filter(x->length(x)==1, collect(keys(_d)))], Vector{Any})
+let _d = OrderedDict([("a", 0)])
+ v = [k for k in filter(x->length(x)==1, collect(keys(_d)))]
+ @test isa(v, Vector{String}) || isa(v, Vector{ASCIIString})
+end
 
 let d = OrderedDict(((1, 2), (3, 4))),
  d2 = OrderedDict([(1, 2), (3, 4)]),