Unnamed repository; edit this file 'description' to name the repository.
Merge ref '63f4513795b1' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@63f4513795b198d034f5d19962659ea488163755
Filtered ref: rust-lang/miri@98aa89407d0362f3063602f77af0788a5e44d708
Upstream diff: https://github.com/rust-lang/rust/compare/b6fdaf2a15736cbccf248b532f48e33179614d40...63f4513795b198d034f5d19962659ea488163755
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/hir-expand/src/inert_attr_macro.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crates/hir-expand/src/inert_attr_macro.rs b/crates/hir-expand/src/inert_attr_macro.rs index b491902377..6dec2c5b32 100644 --- a/crates/hir-expand/src/inert_attr_macro.rs +++ b/crates/hir-expand/src/inert_attr_macro.rs @@ -467,9 +467,6 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ // Used by the `rustc::untracked_query_information` lint to warn methods which // might break incremental compilation. rustc_attr!(rustc_lint_untracked_query_information, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE), - // Used by the `rustc::untranslatable_diagnostic` and `rustc::diagnostic_outside_of_impl` lints - // to assist in changes to diagnostic APIs. - rustc_attr!(rustc_lint_diagnostics, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE), // Used by the `rustc::bad_opt_access` lint to identify `DebuggingOptions` and `CodegenOptions` // types (as well as any others in future). rustc_attr!(rustc_lint_opt_ty, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE), |