summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2019-01-01 20:09:54 +0800
committerJohn Hodge <tpg@ucc.asn.au>2019-01-01 20:09:54 +0800
commit36e67e675aec3e488cd4ad07cbe81d2ec5150a04 (patch)
tree975a225421b88979c39aeef039adbc8b1f1d744e /src
parent6bb397dadbaabeab1a2f8a44da52948c801833b7 (diff)
downloadmrust-36e67e675aec3e488cd4ad07cbe81d2ec5150a04.tar.gz
Resolve UFCS - Fix non-wrapped marker impls
Diffstat (limited to 'src')
-rw-r--r--src/hir_conv/resolve_ufcs.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/hir_conv/resolve_ufcs.cpp b/src/hir_conv/resolve_ufcs.cpp
index 55fbf593..5481fbb9 100644
--- a/src/hir_conv/resolve_ufcs.cpp
+++ b/src/hir_conv/resolve_ufcs.cpp
@@ -91,6 +91,25 @@ namespace {
auto _g = m_resolve.set_impl_generics(impl.m_params);
::HIR::Visitor::visit_type_impl(impl);
}
+ void visit_marker_impl(const ::HIR::SimplePath& trait_path, ::HIR::MarkerImpl& impl) override {
+ ::HIR::ItemPath p( impl.m_type, trait_path, impl.m_trait_args );
+ TRACE_FUNCTION_F("impl" << impl.m_params.fmt_args() << " " << trait_path << impl.m_trait_args << " for " << impl.m_type << " (mod=" << impl.m_src_module << ")");
+ auto _t = this->push_mod_traits( this->m_crate.get_mod_by_path(Span(), impl.m_src_module) );
+ auto _g = m_resolve.set_impl_generics(impl.m_params);
+
+ // TODO: Push a bound that `Self: ThisTrait`
+ m_current_type = &impl.m_type;
+ m_current_trait = &m_crate.get_trait_by_path(Span(), trait_path);
+ m_current_trait_path = &p;
+
+ // The implemented trait is always in scope
+ m_traits.push_back( ::std::make_pair( &trait_path, m_current_trait) );
+ ::HIR::Visitor::visit_marker_impl(trait_path, impl);
+ m_traits.pop_back( );
+
+ m_current_trait = nullptr;
+ m_current_type = nullptr;
+ }
void visit_trait_impl(const ::HIR::SimplePath& trait_path, ::HIR::TraitImpl& impl) override {
::HIR::ItemPath p( impl.m_type, trait_path, impl.m_trait_args );
TRACE_FUNCTION_F("impl" << impl.m_params.fmt_args() << " " << trait_path << impl.m_trait_args << " for " << impl.m_type << " (mod=" << impl.m_src_module << ")");