mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-10 08:57:36 +00:00
save-analysis: fix ICE on partially resolved path
Occurs when we produce save-analysis before type checking is complete (due to errors).
This commit is contained in:
parent
5a6ca7a38d
commit
c53fa9a898
@ -545,7 +545,11 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
|
||||
}
|
||||
|
||||
pub fn get_path_data(&self, id: NodeId, path: &ast::Path) -> Option<Data> {
|
||||
<<<<<<< HEAD
|
||||
let def = self.get_path_def(id);
|
||||
=======
|
||||
let def = option_try!(self.tcx.expect_resolution(id).maybe_full_def());
|
||||
>>>>>>> save-analysis: fix ICE on partially resolved path
|
||||
let sub_span = self.span_utils.span_for_last_ident(path.span);
|
||||
filter!(self.span_utils, sub_span, path.span, None);
|
||||
match def {
|
||||
|
Loading…
Reference in New Issue
Block a user