Merge pull request #25056 from fredrikekre/fe/stdlib-printf

at-[s]printf to Printf stdlib

Author: StefanKarpinski

NEWS.md

@@ -781,6 +781,8 @@ Deprecated or removed
   * 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]).

base/deprecated.jl

@@ -1315,6 +1315,9 @@ export conv, conv2, deconv, filt, filt!, xcorr
 @deprecate_moved eigs "IterativeEigensolvers" true true
 @deprecate_moved svds "IterativeEigensolvers" true true
 
+@eval @deprecate_moved $(Symbol("@printf")) "Printf" true true
+@eval @deprecate_moved $(Symbol("@sprintf")) "Printf" true true
+
 # PR #21709
 @deprecate cov(x::AbstractVector, corrected::Bool) cov(x, corrected=corrected)
 @deprecate cov(x::AbstractMatrix, vardim::Int, corrected::Bool) cov(x, vardim, corrected=corrected)

base/exports.jl

@@ -1173,8 +1173,6 @@ export
 
     # output
     @show,
-    @printf,
-    @sprintf,
 
     # profiling
     @time,

base/interactiveutil.jl

@@ -245,20 +245,20 @@ function _show_cpuinfo(io::IO, info::Sys.CPUinfo, header::Bool=true, prefix::Abs
         println(io, info.model, ": ")
         print(io, " "^length(prefix))
         if tck > 0
-            @printf(io, "    %5s    %9s    %9s    %9s    %9s    %9s\n",
+            Printf.@printf(io, "    %5s    %9s    %9s    %9s    %9s    %9s\n",
                     "speed", "user", "nice", "sys", "idle", "irq")
         else
-            @printf(io, "    %5s    %9s  %9s  %9s  %9s  %9s ticks\n",
+            Printf.@printf(io, "    %5s    %9s  %9s  %9s  %9s  %9s ticks\n",
                     "speed", "user", "nice", "sys", "idle", "irq")
         end
     end
     print(io, prefix)
     if tck > 0
-        @printf(io, "%5d MHz  %9d s  %9d s  %9d s  %9d s  %9d s",
+        Printf.@printf(io, "%5d MHz  %9d s  %9d s  %9d s  %9d s  %9d s",
                 info.speed, info.cpu_times!user / tck, info.cpu_times!nice / tck,
                 info.cpu_times!sys / tck, info.cpu_times!idle / tck, info.cpu_times!irq / tck)
     else
-        @printf(io, "%5d MHz  %9d  %9d  %9d  %9d  %9d ticks",
+        Printf.@printf(io, "%5d MHz  %9d  %9d  %9d  %9d  %9d ticks",
                 info.speed, info.cpu_times!user, info.cpu_times!nice,
                 info.cpu_times!sys, info.cpu_times!idle, info.cpu_times!irq)
     end

base/libgit2/libgit2.jl

@@ -7,6 +7,7 @@ module LibGit2
 
 import Base: ==
 using Base: coalesce, notnothing
+using Base.Printf.@printf
 
 export with, GitRepo, GitConfig
 

base/pkg/entry.jl

@@ -7,6 +7,7 @@ import ..Reqs, ..Read, ..Query, ..Resolve, ..Cache, ..Write, ..Dir
 using ...LibGit2
 import ...Pkg.PkgError
 using ..Types
+using Base.Printf.@printf
 
 macro recover(ex)
     quote

base/printf.jl

@@ -3,7 +3,6 @@
 module Printf
 using Base: Grisu, GMP
 using Base.Unicode: lowercase, textwidth, isupper
-export @printf, @sprintf
 
 ### printf formatter generation ###
 const SmallFloatingPoint = Union{Float64,Float32,Float16}
@@ -1193,27 +1192,6 @@ function _printf(macroname, io, fmt, args)
     Expr(:let, Expr(:block), blk)
 end
 
-"""
-    @printf([io::IOStream], "%Fmt", args...)
-
-Print `args` using C `printf` style format specification string, with some caveats:
-`Inf` and `NaN` are printed consistently as `Inf` and `NaN` for flags `%a`, `%A`,
-`%e`, `%E`, `%f`, `%F`, `%g`, and `%G`. Furthermore, if a floating point number is
-equally close to the numeric values of two possible output strings, the output
-string further away from zero is chosen.
-
-Optionally, an `IOStream`
-may be passed as the first argument to redirect output.
-
-# Examples
-```jldoctest
-julia> @printf("%f %F %f %F\\n", Inf, Inf, NaN, NaN)
-Inf Inf NaN NaN\n
-
-julia> @printf "%.0f %.1f %f\\n" 0.5 0.025 -0.0078125
-1 0.0 -0.007813
-```
-"""
 macro printf(args...)
     isempty(args) && throw(ArgumentError("@printf: called with no arguments"))
     if isa(args[1], AbstractString) || is_str_expr(args[1])
@@ -1225,19 +1203,6 @@ macro printf(args...)
     end
 end
 
-"""
-    @sprintf("%Fmt", args...)
-
-Return `@printf` formatted output as string.
-
-# Examples
-```jldoctest
-julia> s = @sprintf "this is a %s %15.1f" "test" 34.567;
-
-julia> println(s)
-this is a test            34.6
-```
-"""
 macro sprintf(args...)
     isempty(args) && throw(ArgumentError("@sprintf: called with zero arguments"))
     isa(args[1], AbstractString) || is_str_expr(args[1]) ||

base/stacktraces.jl

@@ -8,6 +8,7 @@ module StackTraces
 
 import Base: hash, ==, show
 import Base.Serializer: serialize, deserialize
+using Base.Printf.@printf
 
 export StackTrace, StackFrame, stacktrace, catch_stacktrace
 

base/sysimg.jl

@@ -368,7 +368,7 @@ import .Random: rand, rand!
 
 # (s)printf macros
 include("printf.jl")
-using .Printf
+# import .Printf
 
 # metaprogramming
 include("meta.jl")
@@ -495,6 +495,7 @@ Base.require(:SuiteSparse)
 Base.require(:Test)
 Base.require(:Unicode)
 Base.require(:Distributed)
+Base.require(:Printf)
 
 @eval Base begin
     @deprecate_binding Test root_module(:Test) true ", run `using Test` instead"

base/util.jl

@@ -99,28 +99,28 @@ end
 function format_bytes(bytes)
     bytes, mb = prettyprint_getunits(bytes, length(_mem_units), Int64(1024))
     if mb == 1
-        @sprintf("%d %s%s", bytes, _mem_units[mb], bytes==1 ? "" : "s")
+        Printf.@sprintf("%d %s%s", bytes, _mem_units[mb], bytes==1 ? "" : "s")
     else
-        @sprintf("%.3f %s", bytes, _mem_units[mb])
+        Printf.@sprintf("%.3f %s", bytes, _mem_units[mb])
     end
 end
 
 function time_print(elapsedtime, bytes, gctime, allocs)
-    @printf("%10.6f seconds", elapsedtime/1e9)
+    Printf.@printf("%10.6f seconds", elapsedtime/1e9)
     if bytes != 0 || allocs != 0
         allocs, ma = prettyprint_getunits(allocs, length(_cnt_units), Int64(1000))
         if ma == 1
-            @printf(" (%d%s allocation%s: ", allocs, _cnt_units[ma], allocs==1 ? "" : "s")
+            Printf.@printf(" (%d%s allocation%s: ", allocs, _cnt_units[ma], allocs==1 ? "" : "s")
         else
-            @printf(" (%.2f%s allocations: ", allocs, _cnt_units[ma])
+            Printf.@printf(" (%.2f%s allocations: ", allocs, _cnt_units[ma])
         end
         print(format_bytes(bytes))
         if gctime > 0
-            @printf(", %.2f%% gc time", 100*gctime/elapsedtime)
+            Printf.@printf(", %.2f%% gc time", 100*gctime/elapsedtime)
         end
         print(")")
     elseif gctime > 0
-        @printf(", %.2f%% gc time", 100*gctime/elapsedtime)
+        Printf.@printf(", %.2f%% gc time", 100*gctime/elapsedtime)
     end
     println()
 end