Merge pull request #47 from JuliaString/ox/generic

Handle constructing from AbstractString
JuliaString · Apr 13, 2021 · a2ef2a7 · a2ef2a7 · oxinabox · Apr 13, 2021
2 parents ce799ae + 48574ed
commit a2ef2a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,17 +1,16 @@
 name = "ShortStrings"
 uuid = "63221d1c-8677-4ff0-9126-0ff0817b4975"
-authors = ["Dai ZJ <[email protected]>", "ScottPJones <[email protected]>",
-           "Lyndon White <[email protected]>"]
-version = "0.3.6"
+authors = ["Dai ZJ <[email protected]>", "ScottPJones <[email protected]>", "Lyndon White <[email protected]>"]
+version = "0.3.7"
 
 [deps]
 BitIntegers = "c3b6d118-76ef-56ca-8cc7-ebb389d030a1"
-SortingAlgorithms = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
 MurmurHash3 = "b10b62ed-fbae-5ea5-b934-abaf0477b71d"
+SortingAlgorithms = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
 
 [compat]
-MurmurHash3 = "1.1"
 BitIntegers = "0.2"
+MurmurHash3 = "1.1"
 SortingAlgorithms = "0.3"
 julia = "1"
 

diff --git a/src/base.jl b/src/base.jl
@@ -101,6 +101,8 @@ end
     val
 end
 
+ShortString{T}(s::AbstractString) where T = ShortString{T}(String(s))
+
 function ShortString{T}(s::Union{String,SubString{String}}) where {T}
     sz = sizeof(s)
     sz === 0 && return ShortString{T}(T(0))

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -133,6 +133,12 @@ end
 
     @test_throws ErrorException ShortString("foobar", 3)
     @test_throws ErrorException ss"foobar"b3
+
+
+    @test ShortString7(Test.GenericString("abcde")) == "abcde"
+    @test ShortString7(Test.GenericString("abcde")) isa ShortString7
+    @test ShortString7(SubString(Test.GenericString("abcde"), 2)) == "bcde"
+    @test ShortString7(SubString(Test.GenericString("abcde"), 2)) isa ShortString7
 end