diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2018-02-05 11:00:56 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2018-02-05 11:00:56 +1300 |
| commit | 3c72a848e9d4470d49969fa0ef0a0a8a0c24d681 (patch) | |
| tree | 6378189381724ba42e87d9ce3212c483a81e0226 /src/librustc_save_analysis | |
| parent | 0c6091fbd0eee290c651f73be899f221eeab3c05 (diff) | |
| download | rust-3c72a848e9d4470d49969fa0ef0a0a8a0c24d681.tar.gz rust-3c72a848e9d4470d49969fa0ef0a0a8a0c24d681.zip | |
save-analysis: avoid implicit unwrap
When looking up a field defintion, since the name might be incorrect in the field init shorthand case. cc https://github.com/rust-lang-nursery/rls/issues/699
Diffstat (limited to 'src/librustc_save_analysis')
| -rw-r--r-- | src/librustc_save_analysis/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index 2e494fdfad8..7bd7d5cb15d 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -791,7 +791,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> { field_ref: &ast::Field, variant: &ty::VariantDef, ) -> Option<Ref> { - let f = variant.field_named(field_ref.ident.node.name); + let f = variant.find_field_named(field_ref.ident.node.name)?; // We don't really need a sub-span here, but no harm done let sub_span = self.span_utils.span_for_last_ident(field_ref.ident.span); filter!(self.span_utils, sub_span, field_ref.ident.span, None); |