From 3d1b679a3c3e4b5b0a408e3ba59549bd6c182b1b Mon Sep 17 00:00:00 2001 From: Takayuki Maeda Date: Mon, 4 Jul 2022 17:23:58 +0900 Subject: [PATCH] add `Node::Variant` to `Map::opt_span` --- compiler/rustc_middle/src/hir/map/mod.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_middle/src/hir/map/mod.rs b/compiler/rustc_middle/src/hir/map/mod.rs index 26b43488408..0a9fe24e0c7 100644 --- a/compiler/rustc_middle/src/hir/map/mod.rs +++ b/compiler/rustc_middle/src/hir/map/mod.rs @@ -1012,12 +1012,18 @@ impl<'hir> Map<'hir> { ItemKind::Use(path, _) => path.span, _ => named_span(item.span, item.ident, item.kind.generics()), }, + Node::Variant(variant) => match variant.data { + VariantData::Struct(..) | VariantData::Unit(..) => { + named_span(variant.span, variant.ident, None) + } + VariantData::Tuple(..) => variant.span, + }, Node::ImplItem(item) => named_span(item.span, item.ident, Some(item.generics)), Node::ForeignItem(item) => match item.kind { ForeignItemKind::Fn(decl, _, _) => until_within(item.span, decl.output.span()), _ => named_span(item.span, item.ident, None), }, - Node::Ctor(..) => return self.opt_span(self.get_parent_node(hir_id)), + Node::Ctor(_) => return self.opt_span(self.get_parent_node(hir_id)), _ => self.span_with_body(hir_id), }; Some(span)