---

yaml
---
r: 210553
b: refs/heads/try
c: 232b202
h: refs/heads/master
i:
  210551: 031ff77
v: v3

Author: carols10cents

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 7ec81722250efc7798d9163574e01eec5cde85ca
+refs/heads/try: 232b2022b515fdba7e06354c635998cbc0d76114
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_trans/trans/debuginfo/metadata.rs

@@ -142,26 +142,24 @@ impl<'tcx> TypeMap<'tcx> {
     fn get_unique_type_id_of_type<'a>(&mut self, cx: &CrateContext<'a, 'tcx>,
                                       type_: Ty<'tcx>) -> UniqueTypeId {
 
-        // basic type           -> {:name of the type:}
-        // tuple                -> {tuple_(:param-uid:)*}
-        // struct               -> {struct_:svh: / :node-id:_<(:param-uid:),*> }
-        // enum                 -> {enum_:svh: / :node-id:_<(:param-uid:),*> }
-        // enum variant         -> {variant_:variant-name:_:enum-uid:}
-        // reference (&)        -> {& :pointee-uid:}
-        // mut reference (&mut) -> {&mut :pointee-uid:}
-        // ptr (*)              -> {* :pointee-uid:}
-        // mut ptr (*mut)       -> {*mut :pointee-uid:}
-        // unique ptr (~)       -> {~ :pointee-uid:}
-        // @-ptr (@)            -> {@ :pointee-uid:}
-        // sized vec ([T; x])   -> {[:size:] :element-uid:}
-        // unsized vec ([T])    -> {[] :element-uid:}
-        // trait (T)            -> {trait_:svh: / :node-id:_<(:param-uid:),*> }
-        // closure              -> {<unsafe_> <once_> :store-sigil: |(:param-uid:),* <,_...>| -> \
+        // basic type             -> {:name of the type:}
+        // tuple                  -> {tuple_(:param-uid:)*}
+        // struct                 -> {struct_:svh: / :node-id:_<(:param-uid:),*> }
+        // enum                   -> {enum_:svh: / :node-id:_<(:param-uid:),*> }
+        // enum variant           -> {variant_:variant-name:_:enum-uid:}
+        // reference (&)          -> {& :pointee-uid:}
+        // mut reference (&mut)   -> {&mut :pointee-uid:}
+        // ptr (*)                -> {* :pointee-uid:}
+        // mut ptr (*mut)         -> {*mut :pointee-uid:}
+        // unique ptr (Box)       -> {Box :pointee-uid:}
+        // @-ptr (@)              -> {@ :pointee-uid:}
+        // sized vec ([T; x])     -> {[:size:] :element-uid:}
+        // unsized vec ([T])      -> {[] :element-uid:}
+        // trait (T)              -> {trait_:svh: / :node-id:_<(:param-uid:),*> }
+        // closure                -> {<unsafe_> <once_> :store-sigil: |(:param-uid:),* <,_...>| -> \
         //                             :return-type-uid: : (:bounds:)*}
-        // function             -> {<unsafe_> <abi_> fn( (:param-uid:)* <,_...> ) -> \
+        // function               -> {<unsafe_> <abi_> fn( (:param-uid:)* <,_...> ) -> \
         //                             :return-type-uid:}
-        // unique vec box (~[]) -> {HEAP_VEC_BOX<:pointee-uid:>}
-        // gc box               -> {GC_BOX<:pointee-uid:>}
 
         match self.type_to_unique_id.get(&type_).cloned() {
             Some(unique_type_id) => return unique_type_id,
@@ -202,7 +200,7 @@ impl<'tcx> TypeMap<'tcx> {
                 }
             },
             ty::ty_uniq(inner_type) => {
-                unique_type_id.push('~');
+                unique_type_id.push_str("Box ");
                 let inner_type_id = self.get_unique_type_id_of_type(cx, inner_type);
                 let inner_type_id = self.get_unique_type_id_as_string(inner_type_id);
                 unique_type_id.push_str(&inner_type_id[..]);