Skip to content

Commit edb0831

Browse files
committed
save-analysis: handle missing field names
FIxes rust-lang/rls#1031
1 parent f177b50 commit edb0831

File tree

1 file changed

+7
-6
lines changed
  • src/librustc_save_analysis

1 file changed

+7
-6
lines changed

src/librustc_save_analysis/lib.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -809,13 +809,14 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
809809
field_ref: &ast::Field,
810810
variant: &ty::VariantDef,
811811
) -> Option<Ref> {
812-
let index = self.tcx.find_field_index(field_ref.ident, variant).unwrap();
813812
filter!(self.span_utils, field_ref.ident.span);
814-
let span = self.span_from_span(field_ref.ident.span);
815-
Some(Ref {
816-
kind: RefKind::Variable,
817-
span,
818-
ref_id: id_from_def_id(variant.fields[index].did),
813+
self.tcx.find_field_index(field_ref.ident, variant).map(|index| {
814+
let span = self.span_from_span(field_ref.ident.span);
815+
Ref {
816+
kind: RefKind::Variable,
817+
span,
818+
ref_id: id_from_def_id(variant.fields[index].did),
819+
}
819820
})
820821
}
821822

0 commit comments

Comments
 (0)