Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #151381 - JonathanBrouwer:rollup-zvO3tIH, r=JonathanBrouwer
Rollup of 15 pull requests
Successful merges:
- rust-lang/rust#148623 (Ignore `#[doc(hidden)]` items when computing trimmed paths for printing)
- rust-lang/rust#150550 (Miscellaneous cleanups to borrowck related code)
- rust-lang/rust#150879 (Remove the diagnostic lints)
- rust-lang/rust#150895 (rustc_errors: Add (heuristic) Syntax Highlighting for `rustc --explain`)
- rust-lang/rust#150987 (remote-test-server: Fix header in batch mode)
- rust-lang/rust#151004 (std: implement `sleep_until` on Apple platforms)
- rust-lang/rust#151045 (Simplify some literal-value negations with `u128::wrapping_neg`)
- rust-lang/rust#151119 (Support pointers in type reflection)
- rust-lang/rust#151171 (Do not recover from `Trait()` if generic list is unterminated)
- rust-lang/rust#151231 (HIR typeck cleanup: clarify and re-style `check_expr_unop`)
- rust-lang/rust#151249 (Parse ident with allowing recovery when trying to diagnose)
- rust-lang/rust#151295 (THIR patterns: Use `ty::Value` in more places throughout `const_to_pat`)
- rust-lang/rust#151326 (Remove `DiagMessage::Translated` in favour of `DiagMessage::Str`)
- rust-lang/rust#151361 (add test for issue 61463)
- rust-lang/rust#151371 (Add `S-blocked` to `labels_blocking_approval`)
r? @ghost
| -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), |