move case functions and char predicates back to Base

fixes #25394

Author: JeffBezanson

CONTRIBUTING.md

@@ -174,7 +174,7 @@ The steps required to add a new docstring are listed below:
 Examples written within docstrings can be used as testcases known as "doctests" by annotating code blocks with `jldoctest`.
 
     ```jldoctest
-    julia> Unicode.uppercase("Docstring test")
+    julia> uppercase("Docstring test")
     "DOCSTRING TEST"
     ```
 

NEWS.md

@@ -872,21 +872,17 @@ Deprecated or removed
   * The `sum_kbn` and `cumsum_kbn` functions have been moved to the
     [KahanSummation](https://github.com/JuliaMath/KahanSummation.jl) package ([#24869]).
 
-  * Unicode-related string functions have been moved to the new `Unicode` standard
-    library module ([#25021]). This applies to `normalize_string`, `graphemes`,
-    `is_assigned_char`, `textwidth`, `islower`, `isupper`, `isalpha`,
-    `isdigit`, `isxdigit`, `isnumber`, `isalnum`, `iscntrl`, `ispunct`, `isspace`,
-    `isprint`, `isgraph`, `lowercase`, `uppercase`, `titlecase`, `lcfirst` and `ucfirst`.
+  * `isnumber` has been renamed to `isnumeric` ([#25021]).
+
+  * `is_assigned_char` and `normalize_string` have been renamed to `isassigned` and
+    `normalize`, and moved to the new `Unicode` standard library module.
+    `graphemes` has also been moved to that module ([#25021]).
 
   * The functions `eigs` and `svds` have been moved to the `IterativeEigensolvers` standard
     library module ([#24714]).
 
   * `@printf` and `@sprintf` have been moved to the `Printf` standard library ([#23929],[#25056]).
 
-  * `isnumber` has been deprecated in favor of `isnumeric`, `is_assigned_char`
-    in favor of `isassigned` and `normalize_string` in favor of `normalize`, all three
-    in the new `Unicode` standard library module ([#25021]).
-
   * The aliases `Complex32`, `Complex64` and `Complex128` have been deprecated in favor of `ComplexF16`,
     `ComplexF32` and `ComplexF64` respectively ([#24647]).
 

base/arrayshow.jl

@@ -166,7 +166,7 @@ function print_matrix(io::IO, X::AbstractVecOrMat,
     screenwidth -= length(pre) + length(post)
     presp = repeat(" ", length(pre))  # indent each row to match pre string
     postsp = ""
-    @assert Unicode.textwidth(hdots) == Unicode.textwidth(ddots)
+    @assert textwidth(hdots) == textwidth(ddots)
     sepsize = length(sep)
     rowsA, colsA = axes(X,1), axes(X,2)
     m, n = length(rowsA), length(colsA)

base/char.jl

@@ -127,7 +127,7 @@ function show(io::IO, c::Char)
             (u <<= 8) == 0 && break
         end
         write(io, 0x27)
-    elseif Unicode.isprint(c)
+    elseif isprint(c)
         write(io, 0x27, c, 0x27)
     else # unprintable, well-formed, non-overlong Unicode
         u = UInt32(c)

base/deprecated.jl

@@ -2801,23 +2801,10 @@ end
 @deprecate_moved normalize_string "Unicode" true true
 @deprecate_moved graphemes "Unicode" true true
 @deprecate_moved is_assigned_char "Unicode" true true
-@deprecate_moved textwidth "Unicode" true true
-@deprecate_moved islower "Unicode" true true
-@deprecate_moved isupper "Unicode" true true
-@deprecate_moved isalpha "Unicode" true true
-@deprecate_moved isdigit "Unicode" true true
-@deprecate_moved isnumber "Unicode" true true
-@deprecate_moved isalnum "Unicode" true true
-@deprecate_moved iscntrl "Unicode" true true
-@deprecate_moved ispunct "Unicode" true true
-@deprecate_moved isspace "Unicode" true true
-@deprecate_moved isprint "Unicode" true true
-@deprecate_moved isgraph "Unicode" true true
-@deprecate_moved lowercase "Unicode" true true
-@deprecate_moved uppercase "Unicode" true true
-@deprecate_moved titlecase "Unicode" true true
-@deprecate_moved lcfirst "Unicode" true true
-@deprecate_moved ucfirst "Unicode" true true
+
+@deprecate isalnum(c::Char) isalpha(c) || isnumeric(c)
+@deprecate isgraph(c::Char) isprint(c) && !isspace(c)
+@deprecate isnumber(c::Char) isnumeric(c)
 
 # PR #24647
 @deprecate_binding Complex32  ComplexF16

base/dict.jl

@@ -1,15 +1,15 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
 function _truncate_at_width_or_chars(str, width, chars="", truncmark="…")
-    truncwidth = Unicode.textwidth(truncmark)
+    truncwidth = textwidth(truncmark)
     (width <= 0 || width < truncwidth) && return ""
 
     wid = truncidx = lastidx = 0
     idx = start(str)
     while !done(str, idx)
         lastidx = idx
         c, idx = next(str, idx)
-        wid += Unicode.textwidth(c)
+        wid += textwidth(c)
         wid >= width - truncwidth && truncidx == 0 && (truncidx = lastidx)
         (wid >= width || c in chars) && break
     end

base/docs/utils.jl

@@ -3,7 +3,6 @@
 # Text / HTML objects
 
 import Base: print, show, ==, hash
-using Base.Unicode
 
 export HTML, @html_str
 
@@ -222,8 +221,8 @@ function matchinds(needle, haystack; acronym = false)
     for (i, char) in enumerate(haystack)
         isempty(chars) && break
         while chars[1] == ' ' popfirst!(chars) end # skip spaces
-        if Unicode.lowercase(char) == Unicode.lowercase(chars[1]) &&
-           (!acronym || !Unicode.isalpha(lastc))
+        if lowercase(char) == lowercase(chars[1]) &&
+           (!acronym || !isalpha(lastc))
             push!(is, i)
             popfirst!(chars)
         end

base/exports.jl

@@ -704,7 +704,19 @@ export
     hex2bytes,
     hex2bytes!,
     info,
+    isalpha,
     isascii,
+    iscntrl,
+    isdigit,
+    islower,
+    isnumeric,
+    isprint,
+    ispunct,
+    isspace,
+    isupper,
+    isxdigit,
+    lcfirst,
+    lowercase,
     isvalid,
     join,
     logging,
@@ -736,9 +748,13 @@ export
     string,
     strip,
     summary,
+    textwidth,
     thisind,
+    titlecase,
     transcode,
+    ucfirst,
     unescape_string,
+    uppercase,
     warn,
 
 # logging frontend

base/interactiveutil.jl

@@ -51,7 +51,7 @@ function edit(path::AbstractString, line::Integer=0)
         cmd = line != 0 ? `$command $path -l $line` : `$command $path`
     elseif startswith(name, "subl") || startswith(name, "atom")
         cmd = line != 0 ? `$command $path:$line` : `$command $path`
-    elseif name == "code" || (Sys.iswindows() && Unicode.uppercase(name) == "CODE.EXE")
+    elseif name == "code" || (Sys.iswindows() && uppercase(name) == "CODE.EXE")
         cmd = line != 0 ? `$command -g $path:$line` : `$command -g $path`
     elseif startswith(name, "notepad++")
         cmd = line != 0 ? `$command $path -n$line` : `$command $path`

base/io.jl

@@ -924,8 +924,6 @@ characters from that character until the start of the next line are ignored.
 julia> buf = IOBuffer("    text")
 IOBuffer(data=UInt8[...], readable=true, writable=false, seekable=true, append=false, size=8, maxsize=Inf, ptr=1, mark=-1)
 
-julia> using Unicode
-
 julia> skipchars(buf, isspace)
 IOBuffer(data=UInt8[...], readable=true, writable=false, seekable=true, append=false, size=8, maxsize=Inf, ptr=5, mark=-1)