Skip to content

Commit a5c06f3

Browse files
committed
Eliminate deprecated is_valid_ methods
1 parent 5bb8828 commit a5c06f3

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

base/string.jl

-3
Original file line numberDiff line numberDiff line change
@@ -968,9 +968,6 @@ byte_string_classify(s::ByteString) = byte_string_classify(s.data)
968968
# 1: valid ASCII
969969
# 2: valid UTF-8
970970

971-
is_valid_ascii(s::Union(Array{UInt8,1},ByteString)) = byte_string_classify(s) == 1
972-
is_valid_utf8(s::Union(Array{UInt8,1},ByteString)) = byte_string_classify(s) != 0
973-
974971
isvalid(::Type{ASCIIString}, s::Union(Array{UInt8,1},ByteString)) = byte_string_classify(s) == 1
975972
isvalid(::Type{UTF8String}, s::Union(Array{UInt8,1},ByteString)) = byte_string_classify(s) != 0
976973
isvalid(str::ASCIIString) = byte_string_classify(str) == 1

base/utf16.jl

-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ function isvalid(::Type{UTF16String}, data::AbstractArray{UInt16})
111111
end
112112

113113
isvalid(str::UTF16String) = isvalid(UTF16String, str.data)
114-
is_valid_utf16(str::UTF16String) = isvalid(UTF16String, str.data)
115-
is_valid_utf16(data::AbstractArray{UInt16}) = isvalid(UTF16String, data)
116114

117115
function convert(::Type{UTF16String}, data::AbstractVector{UInt16})
118116
!isvalid(UTF16String, data) && throw(ArgumentError("invalid UTF16 data"))

base/utf32.jl

-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ function isvalid(::Type{UTF32String}, str::Union(Vector{Char}, Vector{UInt32}))
100100
end
101101
isvalid(str::Vector{Char}) = isvalid(UTF32String, str)
102102
isvalid(str::UTF32String) = isvalid(UTF32String, (str.data))
103-
is_valid_utf32(str::Union(Vector{Char}, Vector{UInt32})) = isvalid(UTF32String, str)
104-
is_valid_utf32(str::UTF32String) = isvalid(UTF32String, str.data)
105103

106104
utf32(p::Ptr{Char}, len::Integer) = utf32(pointer_to_array(p, len))
107105
utf32(p::Union(Ptr{UInt32}, Ptr{Int32}), len::Integer) = utf32(convert(Ptr{Char}, p), len)

base/utf8proc.jl

+1-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Base: show, showcompact, ==, hash, string, symbol, isless, length, eltype
88
export isgraphemebreak
99

1010
# also exported by Base:
11-
export normalize_string, graphemes, is_valid_char, is_assigned_char, charwidth, isvalid,
11+
export normalize_string, graphemes, is_assigned_char, charwidth, isvalid,
1212
islower, isupper, isalpha, isdigit, isnumber, isalnum,
1313
iscntrl, ispunct, isspace, isprint, isgraph, isblank
1414

@@ -19,10 +19,6 @@ isvalid(::Type{Char}, ch::Char) = isvalid(Char, UInt32(ch))
1919

2020
isvalid(ch::Char) = isvalid(Char, ch)
2121

22-
is_valid_char(ch::Unsigned) = isvalid(Char, ch)
23-
is_valid_char(ch::Integer) = isvalid(Char, Unsigned(ch))
24-
is_valid_char(ch::Char) = isvalid(Char, UInt32(ch))
25-
2622
# utf8 category constants
2723
const UTF8PROC_CATEGORY_CN = 0
2824
const UTF8PROC_CATEGORY_LU = 1

0 commit comments

Comments
 (0)