nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-17 22:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce opt_ident.

Browse Source
This commit is contained in:
Camille GILLOT 2022-04-19 21:25:26 +02:00
parent 64b6c32b21
commit 1a881a487b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_middle/src/hir/map/mod.rs
View File

@ -910,8 +910,10 @@ impl<'hir> Map<'hir> {
}
}
pub(super) fn opt_ident_span(self, id: HirId) -> Option<Span> {
let ident = match self.get(id) {
#[inline]
fn opt_ident(self, id: HirId) -> Option<Ident> {
match self.get(id) {
Node::Binding(&Pat { kind: PatKind::Binding(_, _, ident, _), .. }) => Some(ident),
// A `Ctor` doesn't have an identifier itself, but its parent
// struct/variant does. Compare with `hir::Map::opt_span`.
Node::Ctor(..) => match self.find(self.get_parent_node(id))? {
@ -920,20 +922,17 @@ impl<'hir> Map<'hir> {
_ => unreachable!(),
},
node => node.ident(),
};
ident.map(|ident| ident.span)
}
}
#[inline]
pub(super) fn opt_ident_span(self, id: HirId) -> Option<Span> {
self.opt_ident(id).map(|ident| ident.span)
}
#[inline]
pub fn opt_name(self, id: HirId) -> Option<Symbol> {
match self.get(id) {
Node::Binding(&Pat { kind: PatKind::Binding(_, _, l, _), .. }) => Some(l.name),
Node::Ctor(..) => match self.find(self.get_parent_node(id))? {
Node::Item(item) => Some(item.ident.name),
Node::Variant(variant) => Some(variant.ident.name),
_ => unreachable!(),
},
node => node.ident().map(|i| i.name),
}
self.opt_ident(id).map(|ident| ident.name)
}
pub fn name(self, id: HirId) -> Symbol {