diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2022-04-25 22:08:45 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2022-05-02 01:56:50 +0300 |
| commit | 5b5964f569ca07ba54710cb440aacaa1cf1e5c1a (patch) | |
| tree | 2bfa7457d9fde6a513c41e9e7a7d10282e92bf39 /compiler/rustc_const_eval/src/util | |
| parent | a933de83989471ac444a13d62996d30621542654 (diff) | |
| download | rust-5b5964f569ca07ba54710cb440aacaa1cf1e5c1a.tar.gz rust-5b5964f569ca07ba54710cb440aacaa1cf1e5c1a.zip | |
rustc: Panic by default in `DefIdTree::parent`
Only crate root def-ids don't have a parent, and in majority of cases the argument of `DefIdTree::parent` cannot be a crate root. So we now panic by default in `parent` and introduce a new non-panicing function `opt_parent` for cases where the argument can be a crate root. Same applies to `local_parent`/`opt_local_parent`.
Diffstat (limited to 'compiler/rustc_const_eval/src/util')
| -rw-r--r-- | compiler/rustc_const_eval/src/util/call_kind.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_const_eval/src/util/call_kind.rs b/compiler/rustc_const_eval/src/util/call_kind.rs index 60b45856f51..a7a480dd1d7 100644 --- a/compiler/rustc_const_eval/src/util/call_kind.rs +++ b/compiler/rustc_const_eval/src/util/call_kind.rs @@ -128,9 +128,9 @@ pub fn call_kind<'tcx>( } else { None }; - let parent_self_ty = tcx - .parent(method_did) - .filter(|did| tcx.def_kind(*did) == rustc_hir::def::DefKind::Impl) + let parent_did = tcx.parent(method_did); + let parent_self_ty = (tcx.def_kind(parent_did) == rustc_hir::def::DefKind::Impl) + .then_some(parent_did) .and_then(|did| match tcx.type_of(did).kind() { ty::Adt(def, ..) => Some(def.did()), _ => None, |