diff options
| author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2021-02-11 12:53:42 +0300 |
|---|---|---|
| committer | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2021-02-18 16:43:42 +0300 |
| commit | 5fd1ebe50f5bea799efd4ab70a816a731df34319 (patch) | |
| tree | 97a86befe70693ad94ebc77bfb64d010639a6a5e | |
| parent | cb2effd44e667d133e31ef334e30d10195218ce6 (diff) | |
| download | rust-5fd1ebe50f5bea799efd4ab70a816a731df34319.tar.gz rust-5fd1ebe50f5bea799efd4ab70a816a731df34319.zip | |
Fix panic in 'remove semicolon' when types are not local
It's not possible to check if removing a semicolon fixes the type error when checking match arms and one or both of the last arm's and the current arm's return types are imported "opaque" types. In these cases we don't generate a "consider removing semicolon" suggestions. Fixes #81839
| -rw-r--r-- | compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs b/compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs index 9e6c11d9ddd..67068322733 100644 --- a/compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs +++ b/compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs @@ -1078,8 +1078,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { "both opaque, likely future {:?} {:?} {:?} {:?}", last_def_id, last_bounds, exp_def_id, exp_bounds ); - let last_hir_id = self.tcx.hir().local_def_id_to_hir_id(last_def_id.expect_local()); - let exp_hir_id = self.tcx.hir().local_def_id_to_hir_id(exp_def_id.expect_local()); + + let (last_local_id, exp_local_id) = + match (last_def_id.as_local(), exp_def_id.as_local()) { + (Some(last_hir_id), Some(exp_hir_id)) => (last_hir_id, exp_hir_id), + (_, _) => return None, + }; + + let last_hir_id = self.tcx.hir().local_def_id_to_hir_id(last_local_id); + let exp_hir_id = self.tcx.hir().local_def_id_to_hir_id(exp_local_id); + match ( &self.tcx.hir().expect_item(last_hir_id).kind, &self.tcx.hir().expect_item(exp_hir_id).kind, |
