wip

Author: StefanKarpinski

base/REPLCompletions.jl

@@ -47,7 +47,7 @@ function complete_symbol(sym, ffunc)
             lookup_module = false
             t, found = get_type(ex, context_module)
         end
-        found || return UTF8String[]
+        found || return String[]
         # Ensure REPLCompletion do not crash when asked to complete a tuple, #15329
         !lookup_module && t <: Tuple && return String[]
     end

base/show.jl

@@ -210,9 +210,9 @@ end
 
 function lambdainfo_slotnames(l::LambdaInfo)
     slotnames = l.slotnames
-    isa(slotnames, Array) || return UTF8String[]
-    names = Dict{UTF8String,Int}()
-    printnames = Vector{UTF8String}(length(slotnames))
+    isa(slotnames, Array) || return String[]
+    names = Dict{String,Int}()
+    printnames = Vector{String}(length(slotnames))
     for i in eachindex(slotnames)
         name = string(slotnames[i])
         idx = get!(names, name, i)
@@ -533,9 +533,9 @@ function show_unquoted(io::IO, ex::Slot, ::Int, ::Int)
         end
     end
     slotnames = get(io, :LAMBDA_SLOTNAMES, false)
-    if (isa(slotnames, Vector{UTF8String}) &&
-        slotid <= length(slotnames::Vector{UTF8String}))
-        print(io, (slotnames::Vector{UTF8String})[slotid])
+    if (isa(slotnames, Vector{String}) &&
+        slotid <= length(slotnames::Vector{String}))
+        print(io, (slotnames::Vector{String})[slotid])
     else
         print(io, "_", slotid)
     end

base/strings/generic.jl

@@ -12,7 +12,7 @@ string(s::AbstractString) = s
 
 bytestring() = ""
 bytestring(s::Vector{UInt8}) =
-    ccall(:jl_pchar_to_string, Ref{ByteString}, (Ptr{UInt8},Int), s, length(s))
+    ccall(:jl_pchar_to_string, Ref{String}, (Ptr{UInt8},Int), s, length(s))
 
 convert(::Type{Vector{UInt8}}, s::AbstractString) = bytestring(s).data
 convert(::Type{Array{UInt8}}, s::AbstractString) = bytestring(s).data

src/init.c

@@ -838,7 +838,6 @@ void jl_get_builtin_hooks(void)
 #endif
 
     jl_string_type = (jl_datatype_t*)core("String");
-    jl_symbolnode_type = (jl_datatype_t*)core("SymbolNode");
     jl_weakref_type = (jl_datatype_t*)core("WeakRef");
 }
 

test/replcompletions.jl

@@ -295,7 +295,7 @@ s = "CompletionFoo.test4(CompletionFoo.test_y_array[1]()[1], CompletionFoo.test_
 c, r, res = test_complete(s)
 @test !res
 @test length(c) == 1
-@test c[1] == string(methods(CompletionFoo.test4, Tuple{ASCIIString, ASCIIString})[1])
+@test c[1] == string(methods(CompletionFoo.test4, Tuple{String, String})[1])
 
 ########## Test where the current inference logic fails ########
 # Fails due to inferrence fails to determine a concrete type for arg 1

test/strings/basic.jl

@@ -93,8 +93,6 @@ end
 @test SubString("hello", 1, 0)[10:9] == ""
 @test SubString("hellø", 1, 6)[10:9] == ""
 @test SubString("hellø", 1, 0)[10:9] == ""
-@test ASCIIString("")[10:9] == ""
-@test UTF8String("")[10:9] == ""
 @test SubString("", 1, 6)[10:9] == ""
 @test SubString("", 1, 0)[10:9] == ""