Merge pull request #110 from davidanthoff/weakrefstrings-update

Update to latest WeakRefStrings
queryverse · Jan 22, 2019 · b0a9454 · b0a9454
2 parents 55ba0c5 + ebca23c
commit b0a9454
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -2,6 +2,6 @@ julia 0.7
 PooledArrays 0.2.0
 Nullables
 DataStructures
-WeakRefStrings 0.4.4
+WeakRefStrings 0.5.4
 CodecZlib
 DoubleFloats
diff --git a/src/csv.jl b/src/csv.jl
@@ -425,19 +425,10 @@ function promote_field(failed_str, field, col, err, nastrings, stringtype, strin
     swapinner(field, newtoken), newcol
 end
 
-function _construct_stringvector(::Type{T}, ::Type{S}, len) where {T<:Array,S}
-    return Vector{S}(undef, len)
-end
-
-function _construct_stringvector(::Type{T}, ::Type{S}, len) where {T<:StringArray,S}
-    return StringVector{S}(len)
-end
-
-
 function promote_column(col, rowno, T, stringtype, stringarraytype, inner=false)
     if typeof(col) <: Array{Missing}
         if T <: StringLike
-            arr = _construct_stringvector(stringarraytype, stringtype, length(col))
+            arr = stringarraytype{stringtype,1}(undef, length(col))
             for i = 1:rowno
                 arr[i] = ""
             end
@@ -594,9 +585,9 @@ function makeoutputvec(eltyp, N, stringtype, stringarraytype)
                                    # all cells were blank
         Array{Missing}(undef, N)
     elseif fieldtype(eltyp) == StrRange
-        _construct_stringvector(stringarraytype, stringtype, N)
+        stringarraytype{stringtype,1}(undef, N)
     elseif ismissingtype(fieldtype(eltyp)) && fieldtype(eltyp) <: StrRange
-        _construct_stringvector(stringarraytype, Union{Missing, String}, N)
+        stringarraytype{Union{Missing, String},1}(undef, N)
     else
         Array{fieldtype(eltyp)}(undef, N)
     end