Deprecate Base.datatype_name to a nameof method

tekverkp · Jan 22, 2018 · b262a61 · b262a61
1 parent 4006e34
commit b262a61
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -965,8 +965,8 @@ Deprecated or removed
  * `findin(a, b)` has been deprecated in favor of `findall(occursin(b), a)` ([#24673]).
 
  * `module_name` has been deprecated in favor of a new, general `nameof` function. Similarly,
- the unexported `Base.function_name` has been deprecated in favor of a `nameof` method
- ([#25622]).
+ the unexported `Base.function_name` and `Base.datatype_name` have been deprecated in favor
+ of `nameof` methods ([#25622]).
 
  * The module `Random.dSFMT` is renamed `Random.DSFMT` ([#25567]).
 

diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -1627,6 +1627,8 @@ export readandwrite
 # PR #25622
 @deprecate module_name(m::Module) nameof(m)
 @deprecate function_name(f::Function) nameof(f) false
+@deprecate datatype_name(t::DataType) nameof(t) false
+@deprecate datatype_name(t::UnionAll) nameof(t) false
 
 # PR #25196
 @deprecate_binding ObjectIdDict IdDict{Any,Any}

diff --git a/base/reflection.jl b/base/reflection.jl
@@ -143,9 +143,10 @@ fieldnames(t::UnionAll) = fieldnames(unwrap_unionall(t))
 fieldnames(t::Type{<:Tuple}) = Int[n for n in 1:fieldcount(t)]
 
 """
- Base.datatype_name(t) -> Symbol
+ nameof(t::DataType) -> Symbol
 
-Get the name of a (potentially UnionAll-wrapped) `DataType` (without its parent module) as a symbol.
+Get the name of a (potentially `UnionAll`-wrapped) `DataType` (without its parent module)
+as a symbol.
 
 # Examples
 ```jldoctest
@@ -155,12 +156,12 @@ julia> module Foo
  end
 Foo
 
-julia> Base.datatype_name(Foo.S{T} where T)
+julia> nameof(Foo.S{T} where T)
 :S
 ```
 """
-datatype_name(t::DataType) = t.name.name
-datatype_name(t::UnionAll) = datatype_name(unwrap_unionall(t))
+nameof(t::DataType) = t.name.name
+nameof(t::UnionAll) = nameof(unwrap_unionall(t))
 
 """
  parentmodule(t::DataType) -> Module

diff --git a/doc/src/base/base.md b/doc/src/base/base.md
@@ -152,7 +152,7 @@ Base.isimmutable
 Base.isabstracttype
 Base.isprimitivetype
 Base.isstructtype
-Base.datatype_name
+Base.nameof(::DataType)
 Base.fieldnames
 Base.fieldname
 ```

diff --git a/stdlib/Dates/src/parse.jl b/stdlib/Dates/src/parse.jl
@@ -16,7 +16,7 @@ function character_codes(directives::SimpleVector)
  return letters
 end
 
-genvar(t::DataType) = Symbol(lowercase(string(Base.datatype_name(t))))
+genvar(t::DataType) = Symbol(lowercase(string(nameof(t))))
 
 """
  tryparsenext_core(str::AbstractString, pos::Int, len::Int, df::DateFormat, raise=false)

diff --git a/stdlib/REPL/src/LineEdit.jl b/stdlib/REPL/src/LineEdit.jl
@@ -219,7 +219,7 @@ const COMMAND_GROUPS =
 
 const COMMAND_GROUP = Dict(command=>group for (group, commands) in COMMAND_GROUPS for command in commands)
 command_group(command::Symbol) = get(COMMAND_GROUP, command, :nogroup)
-command_group(command::Function) = command_group(Base.nameof(command))
+command_group(command::Function) = command_group(nameof(command))
 
 # return true if command should keep active a region
 function preserve_active(command::Symbol)

diff --git a/test/reflection.jl b/test/reflection.jl
@@ -273,7 +273,7 @@ let
  @test parentmodule(foo9475, (Any,)) == TestMod7648.TestModSub9475
  @test parentmodule(foo9475) == TestMod7648.TestModSub9475
  @test parentmodule(Foo7648) == TestMod7648
- @test Base.datatype_name(Foo7648) == :Foo7648
+ @test nameof(Foo7648) == :Foo7648
  @test basename(functionloc(foo7648, (Any,))[1]) == "reflection.jl"
  @test first(methods(TestMod7648.TestModSub9475.foo7648)) == @which foo7648(5)
  @test TestMod7648 == @which foo7648