rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

First batch of review feedback changes from #102110

Browse Source
This commit is contained in:
Nathan Stocks
2022-10-03 17:34:59 -06:00
parent be4059dd3e
commit 965dbf6c28
9 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_passes/src/diagnostic_items.rs
View File

@@ -14,7 +14,7 @@ use rustc_hir::diagnostic_items::DiagnosticItems;
use rustc_middle::ty::query::Providers;
use rustc_middle::ty::TyCtxt;
use rustc_span::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
use rustc_span::symbol::{sym, Symbol};
use rustc_span::symbol::{kw::Empty, sym, Symbol};
use crate::errors::{DuplicateDiagnosticItem, DuplicateDiagnosticItemInCrate};
@@ -46,7 +46,7 @@ fn collect_item(tcx: TyCtxt<'_>, items: &mut DiagnosticItems, name: Symbol, item
None => tcx.sess.emit_err(DuplicateDiagnosticItemInCrate {
span: orig_span,
// FIXME: We should not provide `name` to `orig_crate_name`. How do you create a blank/empty symbol?
orig_crate_name: orig_crate_name.unwrap_or(name),
orig_crate_name: orig_crate_name.unwrap_or(Empty),
have_orig_crate_name: orig_crate_name.map(|_| ()),
crate_name: tcx.crate_name(item_def_id.krate),
name,