Merge branch 'master' of https://github.com/thepowersgang/mrustc

# Conflicts:
#	src/common.hpp
#	src/hir/deserialise.cpp
#	src/hir_typeck/static.cpp
#	src/mir/from_hir.cpp
#	src/mir/from_hir.hpp
#	src/mir/from_hir_match.cpp
#	src/mir/helpers.hpp
#	src/mir/mir_builder.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp
index c08f886d..0ff4d63b 100644
--- a/src/hir/deserialise.cpp
+++ b/src/hir/deserialise.cpp
@@ -586,6 +586,7 @@ namespace {
             m.dst_type = static_cast< ::HIR::TraitMarkings::DstType>( m_in.read_tag() );
             m.coerce_unsized_index = m_in.read_count( );
             m.unsized_field = m_in.read_count( );
+            m.unsized_param = m_in.read_count();
             // TODO: auto_impls
             return m;
         }
@@ -1009,6 +1010,11 @@ namespace {
 			sdf.other = static_cast<unsigned int>(m_in.read_count());
 			return ::MIR::Statement::make_SetDropFlag(sdf);
 			}
+        case 4:
+            return ::MIR::Statement::make_ScopeEnd({
+                deserialise_vec<unsigned int>(),
+                deserialise_vec<unsigned int>()
+                });
         default:
             ::std::cerr << "Bad tag for a MIR Statement" << ::std::endl;
             throw "";