bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make E0023 spans even more precise

Browse source
This commit is contained in:
Noah Lev 2021-08-18 16:13:52 -07:00
parent d0b482a27c
commit 0fa3b4f940
11 changed files with 131 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_ty_utils/src/ty.rs
View file

@ -223,7 +223,18 @@ fn associated_items(tcx: TyCtxt<'_>, def_id: DefId) -> ty::AssocItems<'_> {
}
fn def_ident_span(tcx: TyCtxt<'_>, def_id: DefId) -> Option<Span> {
tcx.hir().get_if_local(def_id).and_then(|node| node.ident()).map(|ident| ident.span)
tcx.hir()
.get_if_local(def_id)
.and_then(|node| match node {
// A `Ctor` doesn't have an identifier itself, but its parent
// struct/variant does. Compare with `hir::Map::opt_span`.
hir::Node::Ctor(ctor) => ctor
.ctor_hir_id()
.and_then(|ctor_id| tcx.hir().find(tcx.hir().get_parent_node(ctor_id)))
.and_then(|parent| parent.ident()),
_ => node.ident(),
})
.map(|ident| ident.span)
}
/// If the given `DefId` describes an item belonging to a trait,