user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Permit impls referencing errors to overlap

Browse source
This commit is contained in:
Mark Rousskov 2019-09-14 19:26:49 -04:00
parent ca3766e2e5
commit 959c710e85
3 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/ty/mod.rs
View file

@ -2894,6 +2894,13 @@ impl<'tcx> TyCtxt<'tcx> {
pub fn impls_are_allowed_to_overlap(self, def_id1: DefId, def_id2: DefId)
-> Option<ImplOverlapKind>
{
// If either trait impl references an error, they're allowed to overlap,
// as one of them essentially doesn't exist.
if self.impl_trait_ref(def_id1).map_or(false, |tr| tr.references_error()) ||
self.impl_trait_ref(def_id2).map_or(false, |tr| tr.references_error()) {
return Some(ImplOverlapKind::Permitted);
}
let is_legit = if self.features().overlapping_marker_traits {
let trait1_is_empty = self.impl_trait_ref(def_id1)
.map_or(false, |trait_ref| {