Skip to content

Commit 232b202

Browse files
committed
Update debuginfo metadata to use Box instead of ~
Also remove comments that reference the unique_type_id HEAP_VEC_BOX metadata, which was removed in 3e62637 and the unique_type_id GC_BOX metadata, which was removed in 8a91d33.
1 parent 7ec8172 commit 232b202

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

src/librustc_trans/trans/debuginfo/metadata.rs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -142,26 +142,24 @@ impl<'tcx> TypeMap<'tcx> {
142142
fn get_unique_type_id_of_type<'a>(&mut self, cx: &CrateContext<'a, 'tcx>,
143143
type_: Ty<'tcx>) -> UniqueTypeId {
144144

145-
// basic type -> {:name of the type:}
146-
// tuple -> {tuple_(:param-uid:)*}
147-
// struct -> {struct_:svh: / :node-id:_<(:param-uid:),*> }
148-
// enum -> {enum_:svh: / :node-id:_<(:param-uid:),*> }
149-
// enum variant -> {variant_:variant-name:_:enum-uid:}
150-
// reference (&) -> {& :pointee-uid:}
151-
// mut reference (&mut) -> {&mut :pointee-uid:}
152-
// ptr (*) -> {* :pointee-uid:}
153-
// mut ptr (*mut) -> {*mut :pointee-uid:}
154-
// unique ptr (~) -> {~ :pointee-uid:}
155-
// @-ptr (@) -> {@ :pointee-uid:}
156-
// sized vec ([T; x]) -> {[:size:] :element-uid:}
157-
// unsized vec ([T]) -> {[] :element-uid:}
158-
// trait (T) -> {trait_:svh: / :node-id:_<(:param-uid:),*> }
159-
// closure -> {<unsafe_> <once_> :store-sigil: |(:param-uid:),* <,_...>| -> \
145+
// basic type -> {:name of the type:}
146+
// tuple -> {tuple_(:param-uid:)*}
147+
// struct -> {struct_:svh: / :node-id:_<(:param-uid:),*> }
148+
// enum -> {enum_:svh: / :node-id:_<(:param-uid:),*> }
149+
// enum variant -> {variant_:variant-name:_:enum-uid:}
150+
// reference (&) -> {& :pointee-uid:}
151+
// mut reference (&mut) -> {&mut :pointee-uid:}
152+
// ptr (*) -> {* :pointee-uid:}
153+
// mut ptr (*mut) -> {*mut :pointee-uid:}
154+
// unique ptr (Box) -> {Box :pointee-uid:}
155+
// @-ptr (@) -> {@ :pointee-uid:}
156+
// sized vec ([T; x]) -> {[:size:] :element-uid:}
157+
// unsized vec ([T]) -> {[] :element-uid:}
158+
// trait (T) -> {trait_:svh: / :node-id:_<(:param-uid:),*> }
159+
// closure -> {<unsafe_> <once_> :store-sigil: |(:param-uid:),* <,_...>| -> \
160160
// :return-type-uid: : (:bounds:)*}
161-
// function -> {<unsafe_> <abi_> fn( (:param-uid:)* <,_...> ) -> \
161+
// function -> {<unsafe_> <abi_> fn( (:param-uid:)* <,_...> ) -> \
162162
// :return-type-uid:}
163-
// unique vec box (~[]) -> {HEAP_VEC_BOX<:pointee-uid:>}
164-
// gc box -> {GC_BOX<:pointee-uid:>}
165163

166164
match self.type_to_unique_id.get(&type_).cloned() {
167165
Some(unique_type_id) => return unique_type_id,
@@ -202,7 +200,7 @@ impl<'tcx> TypeMap<'tcx> {
202200
}
203201
},
204202
ty::ty_uniq(inner_type) => {
205-
unique_type_id.push('~');
203+
unique_type_id.push_str("Box ");
206204
let inner_type_id = self.get_unique_type_id_of_type(cx, inner_type);
207205
let inner_type_id = self.get_unique_type_id_as_string(inner_type_id);
208206
unique_type_id.push_str(&inner_type_id[..]);

0 commit comments

Comments
 (0)