bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make hir::PathSegment::res non-optional.

Browse source
This commit is contained in:
Nicholas Nethercote 2022-08-30 15:10:28 +10:00
parent ee244bf196
commit 6d850d936b
20 changed files with 65 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_save_analysis/src/dump_visitor.rs
View file

@ -912,7 +912,7 @@ impl<'tcx> DumpVisitor<'tcx> {
_,
)
| Res::SelfTy { .. } => {
self.dump_path_segment_ref(id, &hir::PathSegment::from_ident(ident));
self.dump_path_segment_ref(id, &hir::PathSegment::from_ident(ident, Res::Err));
}
def => {
error!("unexpected definition kind when processing collected idents: {:?}", def)

9
compiler/rustc_save_analysis/src/lib.rs
View file

@ -596,13 +596,14 @@ impl<'tcx> SaveContext<'tcx> {
Node::TraitRef(tr) => tr.path.res,
Node::Item(&hir::Item { kind: hir::ItemKind::Use(path, _), .. }) => path.res,
Node::PathSegment(seg) => match seg.res {
Some(res) if res != Res::Err => res,
_ => {
Node::PathSegment(seg) => {
if seg.res != Res::Err {
seg.res
} else {
let parent_node = self.tcx.hir().get_parent_node(hir_id);
self.get_path_res(parent_node)
}
},
}
Node::Expr(&hir::Expr { kind: hir::ExprKind::Struct(ref qpath, ..), .. }) => {
self.typeck_results().qpath_res(qpath, hir_id)