diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/hir/type.cpp | 81 | ||||
| -rw-r--r-- | src/hir_typeck/helpers.cpp | 2 |
2 files changed, 49 insertions, 34 deletions
diff --git a/src/hir/type.cpp b/src/hir/type.cpp index 5233b681..2daf1612 100644 --- a/src/hir/type.cpp +++ b/src/hir/type.cpp @@ -599,41 +599,50 @@ bool ::HIR::TypeRef::match_test_generics(const Span& sp, const ::HIR::TypeRef& x return Compare::Equal; ), (Path, + ::HIR::Compare rv = Compare::Unequal; if( te.path.m_data.tag() != xe.path.m_data.tag() ) { - return Compare::Unequal; + rv = Compare::Unequal; } - TU_MATCH(::HIR::Path::Data, (te.path.m_data, xe.path.m_data), (tpe, xpe), - (Generic, - if( tpe.m_path != xpe.m_path ) { - return Compare::Unequal; - } - return match_generics_pp(sp, tpe.m_params, xpe.m_params, resolve_placeholder, callback); - ), - (UfcsKnown, - auto cmp = tpe.type->match_test_generics_fuzz( sp, *xpe.type, resolve_placeholder, callback ); - if( tpe.trait.m_path != xpe.trait.m_path ) - return Compare::Unequal; - cmp &= match_generics_pp(sp, tpe.trait.m_params, xpe.trait.m_params, resolve_placeholder, callback); - if( tpe.item != xpe.item ) - return Compare::Unequal; - cmp &= match_generics_pp(sp, tpe.params, xpe.params, resolve_placeholder, callback); - return cmp; - ), - (UfcsUnknown, - auto cmp = tpe.type->match_test_generics_fuzz( sp, *xpe.type, resolve_placeholder, callback ); - if( tpe.item != xpe.item ) - return Compare::Unequal; - cmp &= match_generics_pp(sp, tpe.params, xpe.params, resolve_placeholder, callback); - return cmp; - ), - (UfcsInherent, - auto cmp = tpe.type->match_test_generics_fuzz( sp, *xpe.type, resolve_placeholder, callback ); - if( tpe.item != xpe.item ) - return Compare::Unequal; - cmp &= match_generics_pp(sp, tpe.params, xpe.params, resolve_placeholder, callback); - return cmp; + else { + TU_MATCH(::HIR::Path::Data, (te.path.m_data, xe.path.m_data), (tpe, xpe), + (Generic, + if( tpe.m_path != xpe.m_path ) { + rv = Compare::Unequal; + } + else { + rv = match_generics_pp(sp, tpe.m_params, xpe.m_params, resolve_placeholder, callback); + } + ), + (UfcsKnown, + rv = tpe.type->match_test_generics_fuzz( sp, *xpe.type, resolve_placeholder, callback ); + if( tpe.trait.m_path != xpe.trait.m_path ) + rv = Compare::Unequal; + rv &= match_generics_pp(sp, tpe.trait.m_params, xpe.trait.m_params, resolve_placeholder, callback); + if( tpe.item != xpe.item ) + rv = Compare::Unequal; + rv &= match_generics_pp(sp, tpe.params, xpe.params, resolve_placeholder, callback); + ), + (UfcsUnknown, + rv = tpe.type->match_test_generics_fuzz( sp, *xpe.type, resolve_placeholder, callback ); + if( tpe.item != xpe.item ) + rv = Compare::Unequal; + rv &= match_generics_pp(sp, tpe.params, xpe.params, resolve_placeholder, callback); + ), + (UfcsInherent, + rv = tpe.type->match_test_generics_fuzz( sp, *xpe.type, resolve_placeholder, callback ); + if( tpe.item != xpe.item ) + rv = Compare::Unequal; + rv &= match_generics_pp(sp, tpe.params, xpe.params, resolve_placeholder, callback); + ) ) - ) + } + + if( rv == ::HIR::Compare::Unequal ) { + if( te.binding.is_Unbound() || xe.binding.is_Unbound() ) { + rv = ::HIR::Compare::Fuzzy; + } + } + return rv; ), (TraitObject, if( te.m_trait.m_path.m_path != xe.m_trait.m_path.m_path ) { @@ -987,7 +996,13 @@ bool ::HIR::TypeRef::match_test_generics(const Span& sp, const ::HIR::TypeRef& x return (le == re ? Compare::Equal : Compare::Unequal); ), (Path, - return le.path.compare_with_placeholders( sp, re.path, resolve_placeholder ); + auto rv = le.path.compare_with_placeholders( sp, re.path, resolve_placeholder ); + if( rv == ::HIR::Compare::Unequal ) { + if( le.binding.is_Unbound() || re.binding.is_Unbound() ) { + rv = ::HIR::Compare::Fuzzy; + } + } + return rv; ), (Generic, if( le.binding != re.binding ) { diff --git a/src/hir_typeck/helpers.cpp b/src/hir_typeck/helpers.cpp index 30fc9d83..d6f645c7 100644 --- a/src/hir_typeck/helpers.cpp +++ b/src/hir_typeck/helpers.cpp @@ -2510,7 +2510,7 @@ bool TraitResolution::find_trait_impls_crate(const Span& sp, DEBUG("Equal"); continue; case ::HIR::Compare::Unequal: - DEBUG("Assoc " << assoc_bound.first << " failure - " << ty << " != " << assoc_bound.second); + DEBUG("Assoc `" << assoc_bound.first << "` didn't match - " << ty << " != " << assoc_bound.second); return false; case ::HIR::Compare::Fuzzy: // TODO: When a fuzzy match is encountered on a conditional bound, returning `false` can lead to an false negative (and a compile error) |