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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/hir/type.cpp b/src/hir/type.cpp
index 033e7bf5..6f826111 100644
--- a/src/hir/type.cpp
+++ b/src/hir/type.cpp
@@ -112,8 +112,8 @@ void ::HIR::TypeRef::fmt(::std::ostream& os) const
         }
         for(const auto& tr : e.m_markers)
             os << "+" << tr;
-        if( e.m_lifetime.name != "" )
-            os << "+ '" << e.m_lifetime.name;
+        if( e.m_lifetime != LifetimeRef::new_static() )
+            os << "+" << e.m_lifetime;
         os << ")";
         ),
     (ErasedType,
@@ -123,8 +123,8 @@ void ::HIR::TypeRef::fmt(::std::ostream& os) const
                 os << "+";
             os << tr;
         }
-        if( e.m_lifetime.name != "" )
-            os << "+ '" << e.m_lifetime.name;
+        if( e.m_lifetime != LifetimeRef::new_static() )
+            os << "+ '" << e.m_lifetime;
         os << "/*" << e.m_origin << "#" << e.m_index << "*/";
         ),
     (Array,
@@ -860,7 +860,7 @@ bool ::HIR::TypeRef::match_test_generics(const Span& sp, const ::HIR::TypeRef& x
         return ::HIR::TypeRef( Data::make_Tuple(mv$(types)) );
         ),
     (Borrow,
-        return ::HIR::TypeRef( Data::make_Borrow({e.type, box$(e.inner->clone())}) );
+        return ::HIR::TypeRef( Data::make_Borrow({e.lifetime, e.type, box$(e.inner->clone())}) );
         ),
     (Pointer,
         return ::HIR::TypeRef( Data::make_Pointer({e.type, box$(e.inner->clone())}) );