summaryrefslogtreecommitdiff
path: root/src/hir/deserialise.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-12-01 19:05:14 +0800
committerJohn Hodge <tpg@mutabah.net>2016-12-01 19:05:14 +0800
commit35142acbe2deacf0cee3f92ed28e3beb01c22cd5 (patch)
tree87d07ea761ce4f4c973c417e8b0f4a6bbb1d13e0 /src/hir/deserialise.cpp
parent264bb4feab3e128db025a77f127b256ebf4f0e49 (diff)
downloadmrust-35142acbe2deacf0cee3f92ed28e3beb01c22cd5.tar.gz
Trans - Enumeration work structured out, vtables hacked in
Diffstat (limited to 'src/hir/deserialise.cpp')
-rw-r--r--src/hir/deserialise.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp
index 1880b660..649d97fd 100644
--- a/src/hir/deserialise.cpp
+++ b/src/hir/deserialise.cpp
@@ -710,19 +710,21 @@ namespace {
return ::HIR::Path( deserialise_genericpath() );
case 1:
DEBUG("Inherent");
- return ::HIR::Path {
- deserialise_type(),
+ return ::HIR::Path( ::HIR::Path::Data::Data_UfcsInherent {
+ box$( deserialise_type() ),
m_in.read_string(),
+ deserialise_pathparams(),
deserialise_pathparams()
- };
+ } );
case 2:
DEBUG("Known");
- return ::HIR::Path {
- deserialise_type(),
+ return ::HIR::Path( ::HIR::Path::Data::Data_UfcsKnown {
+ box$( deserialise_type() ),
deserialise_genericpath(),
m_in.read_string(),
+ deserialise_pathparams(),
deserialise_pathparams()
- };
+ } );
default:
throw "";
}