Update to julia 0.7

queryverse · Aug 3, 2018 · d7b4815 · d7b4815
1 parent 378a5e3
commit d7b4815
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,4 @@
-julia 0.6
+julia 0.7-
 TextParse
 JSON
 DataValues

diff --git a/src/VegaDatasets.jl b/src/VegaDatasets.jl
@@ -1,4 +1,3 @@
-__precompile__()
 module VegaDatasets
 
 using JSON, TextParse, DataValues, TableShowUtils, DataStructures,
@@ -8,7 +7,7 @@ import IterableTables
 export dataset
 
 struct VegaDataset
-    data::Union{OrderedDict{Symbol,Any}, Void}
+    data::Union{OrderedDict{Symbol,Any}, Nothing}
     path::AbstractPath
 end
 
@@ -52,22 +51,22 @@ function load_json(filename)
     coltypes = Type[]
     for col in colnames        
         curr_T = typeof(get(json_data[1], col, DataValues.NA))
-        if curr_T <: Void
+        if curr_T <: Nothing
             curr_T = typeof(DataValues.NA)
         end
         col_type = curr_T
 
         for row in 2:length(json_data)
             curr_T = typeof(get(json_data[row], col, DataValues.NA))
-            if curr_T <: Void
+            if curr_T <: Nothing
                 curr_T = typeof(DataValues.NA)
             end
             col_type = Base.promote_type(col_type, curr_T)
         end
         push!(coltypes, col_type)
     end
 
-    coldata = [ct <: DataValue ? DataValueVector{eltype(ct)}(nrows) : Vector{ct}(nrows) for ct in coltypes]
+    coldata = [ct <: DataValue ? DataValueVector{eltype(ct)}(nrows) : Vector{ct}(undef, nrows) for ct in coltypes]
 
     for (i,row) in enumerate(json_data)
         for colindx in 1:ncols

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,6 +1,6 @@
 using VegaDatasets
 import IteratorInterfaceExtensions, TableTraits, TableShowUtils
-using Base.Test
+using Test
 
 @testset "VegaDatasets" begin