summaryrefslogtreecommitdiff
path: root/src/resolve/absolute.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-09-24 13:25:47 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-09-24 13:25:47 +0800
commitbccafcd4de2e835201578f55f52542ceecfa4701 (patch)
treee35bd3ed7301f31275b4537f201cf61664d595cd /src/resolve/absolute.cpp
parentbe3b87f014812c86e5a7421292d10580b23d2906 (diff)
downloadmrust-bccafcd4de2e835201578f55f52542ceecfa4701.tar.gz
LoadCrates - Support loading crates that might collide (and handle name collisions)
Diffstat (limited to 'src/resolve/absolute.cpp')
-rw-r--r--src/resolve/absolute.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/resolve/absolute.cpp b/src/resolve/absolute.cpp
index f21dc77d..cee4df7e 100644
--- a/src/resolve/absolute.cpp
+++ b/src/resolve/absolute.cpp
@@ -785,7 +785,7 @@ namespace {
void Resolve_Absolute_Path_BindAbsolute__hir_from(Context& context, const Span& sp, Context::LookupMode& mode, ::AST::Path& path, const AST::ExternCrate& crate, unsigned int start)
{
- TRACE_FUNCTION_FR(path << " start=" << start, path);
+ TRACE_FUNCTION_FR( crate.m_hir->m_crate_name << " - " << path << " start=" << start, path);
auto& path_abs = path.m_class.as_Absolute();
if( path_abs.nodes.empty() ) {
@@ -1009,12 +1009,10 @@ namespace {
),
(StructConstructor,
auto ty_path = e.ty;
- ty_path.m_crate_name = "";
path.bind( ::AST::PathBinding::make_Struct({nullptr, &crate.m_hir->get_struct_by_path(sp, ty_path)}) );
),
(StructConstant,
auto ty_path = e.ty;
- ty_path.m_crate_name = "";
path.bind( ::AST::PathBinding::make_Struct({nullptr, &crate.m_hir->get_struct_by_path(sp, ty_path)}) );
),
(Static,