Rollup merge of #104391 - nnethercote:deriving-cleanups, r=jackh726

Deriving cleanups

Fixing some minor problems `@RalfJung` found in #99046.

r? `@RalfJung`

diff --cc compiler/rustc_ast/src/ast.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/bounds.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/clone.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/debug.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/decodable.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/default.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/encodable.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
Simple merge

diff --cc compiler/rustc_builtin_macros/src/deriving/hash.rs
Simple merge