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_lint/src | |
| 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_lint/src')
| -rw-r--r-- | compiler/rustc_lint/src/types.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_lint/src/types.rs b/compiler/rustc_lint/src/types.rs index 437104d1aaf..dfce30171ff 100644 --- a/compiler/rustc_lint/src/types.rs +++ b/compiler/rustc_lint/src/types.rs @@ -1471,7 +1471,7 @@ impl InvalidAtomicOrdering { && let Some(adt) = cx.tcx.type_of(impl_did).ty_adt_def() // skip extension traits, only lint functions from the standard library && cx.tcx.trait_id_of_impl(impl_did).is_none() - && let Some(parent) = cx.tcx.parent(adt.did()) + && let parent = cx.tcx.parent(adt.did()) && cx.tcx.is_diagnostic_item(sym::atomic_mod, parent) && ATOMIC_TYPES.contains(&cx.tcx.item_name(adt.did())) { @@ -1486,9 +1486,9 @@ impl InvalidAtomicOrdering { orderings.iter().any(|ordering| { tcx.item_name(did) == *ordering && { let parent = tcx.parent(did); - parent == atomic_ordering + Some(parent) == atomic_ordering // needed in case this is a ctor, not a variant - || parent.map_or(false, |parent| tcx.parent(parent) == atomic_ordering) + || tcx.opt_parent(parent) == atomic_ordering } }) } |
