diff options
| author | bors <bors@rust-lang.org> | 2025-05-18 12:05:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-18 12:05:55 +0000 |
| commit | b53e5c9db04c89fa15c96f03ae2e0c538b598940 (patch) | |
| tree | f0b3e02e2c8a2eb9841d4e45272281b730c7f57c /compiler/rustc_resolve/src | |
| parent | 7205fc537d0fe8c3c2560b313e54fcb91ab6f3d1 (diff) | |
| parent | c7e2e88da00a47346b76629ca3f72bf3a49d2bbf (diff) | |
| download | rust-b53e5c9db04c89fa15c96f03ae2e0c538b598940.tar.gz rust-b53e5c9db04c89fa15c96f03ae2e0c538b598940.zip | |
Auto merge of #141216 - fmease:rollup-pa5mvx3, r=fmease
Rollup of 8 pull requests Successful merges: - #140113 (Add per page TOC in the `rustc` book) - #140511 (Stabilize `#![feature(non_null_from_ref)]`) - #140924 (Make some `f32`/`f64` tests also run in const-context) - #140966 (Remove #![feature(let_chains)] from library and src/librustdoc) - #141045 ([win][arm64] Remove 'Arm64 Hazard' undocumented MSVC option and instead disable problematic test) - #141071 (Enable [behind-upstream] triagebot option for rust-lang/rust) - #141132 (Use `crate::` prefix for root macro suggestions) - #141139 (Fix Rust for Linux ping group label) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_resolve/src')
| -rw-r--r-- | compiler/rustc_resolve/src/diagnostics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs index 0b16983c2c7..d09750fa281 100644 --- a/compiler/rustc_resolve/src/diagnostics.rs +++ b/compiler/rustc_resolve/src/diagnostics.rs @@ -2493,7 +2493,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { let Res::Def(DefKind::Macro(MacroKind::Bang), _) = binding.res() else { return None; }; - let module_name = crate_module.kind.name().unwrap_or(kw::Empty); + let module_name = crate_module.kind.name().unwrap_or(kw::Crate); let import_snippet = match import.kind { ImportKind::Single { source, target, .. } if source != target => { format!("{source} as {target}") |