diff options
| author | bors <bors@rust-lang.org> | 2022-08-18 07:09:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-18 07:09:06 +0000 |
| commit | f241c0c43d71960f078b897e9b8721d4b452ce5e (patch) | |
| tree | 4d165827226b99caaaa6e2f17ac22fc83ec9ef44 /compiler/rustc_errors/src | |
| parent | 9c20b2a8cc7588decb6de25ac6a7912dcef24d65 (diff) | |
| parent | c7a494258846bd249a8440869ff0f6578e3b6080 (diff) | |
| download | rust-f241c0c43d71960f078b897e9b8721d4b452ce5e.tar.gz rust-f241c0c43d71960f078b897e9b8721d4b452ce5e.zip | |
Auto merge of #100708 - matthiaskrgr:rollup-vl0olnj, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #97962 (Make must_not_suspend lint see through references when drop tracking is enabled) - #99966 (avoid assertion failures in try_to_scalar_int) - #100637 (Improving Fuchsia rustc support documentation) - #100643 (Point at a type parameter shadowing another type) - #100651 (Migrations for rustc_expand transcribe.rs) - #100669 (Attribute cleanups) - #100670 (Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery) - #100674 (Migrate lint reports in typeck::check_unused to LintDiagnostic) - #100688 (`ty::Error` does not match other types for region constraints) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 17e6c9e9575..356f9dfdb3b 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -8,7 +8,7 @@ use rustc_error_messages::FluentValue; use rustc_hir as hir; use rustc_lint_defs::{Applicability, LintExpectationId}; use rustc_span::edition::LATEST_STABLE_EDITION; -use rustc_span::symbol::{Ident, Symbol}; +use rustc_span::symbol::{Ident, MacroRulesNormalizedIdent, Symbol}; use rustc_span::{edition::Edition, Span, DUMMY_SP}; use std::borrow::Cow; use std::fmt; @@ -87,6 +87,7 @@ into_diagnostic_arg_using_display!( hir::Target, Edition, Ident, + MacroRulesNormalizedIdent, ); impl IntoDiagnosticArg for bool { |