@@ -601,10 +601,8 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
601
601
_) => {
602
602
( ident, fn_decl, generics, Some ( top_level_block) , span)
603
603
}
604
- ast_map:: node_foreign_item( @ast:: foreign_item { _ } , _, _, _) => {
605
- return FunctionWithoutDebugInfo ;
606
- }
607
- ast_map:: node_variant( * ) |
604
+ ast_map:: node_foreign_item( @ast:: foreign_item { _ } , _, _, _) |
605
+ ast_map:: node_variant( * ) |
608
606
ast_map:: node_struct_ctor( * ) => {
609
607
return FunctionWithoutDebugInfo ;
610
608
}
@@ -1166,9 +1164,10 @@ impl RecursiveTypeDescription {
1166
1164
// Insert the stub into the cache in order to allow recursive references ...
1167
1165
debug_context ( cx) . created_types . insert ( cache_id, metadata_stub) ;
1168
1166
1169
- // ... then create the member descriptions
1167
+ // ... then create the member descriptions ...
1170
1168
let member_descriptions = member_description_factory ( cx) ;
1171
1169
1170
+ // ... and attach them to the stub to complete it.
1172
1171
set_members_of_composite_type ( cx,
1173
1172
metadata_stub,
1174
1173
llvm_type,
@@ -1465,7 +1464,7 @@ fn prepare_enum_metadata(cx: &mut CrateContext,
1465
1464
}
1466
1465
1467
1466
enum MemberOffset {
1468
- FixedMemberOffset { bytes : uint } ,
1467
+ FixedMemberOffset { bytes : uint } ,
1469
1468
// For ComputedMemberOffset, the offset is read from the llvm type definition
1470
1469
ComputedMemberOffset
1471
1470
}
@@ -1863,14 +1862,14 @@ fn trait_metadata(cx: &mut CrateContext,
1863
1862
// the trait's methods.
1864
1863
let path = ty:: item_path ( cx. tcx , def_id) ;
1865
1864
let ident = path. last ( ) . ident ( ) ;
1866
- let name = ppaux:: trait_store_to_str ( cx. tcx , trait_store)
1867
- + ppaux:: mutability_to_str ( mutability)
1868
- + token:: ident_to_str ( & ident) ;
1865
+ let name = ppaux:: trait_store_to_str ( cx. tcx , trait_store) +
1866
+ ppaux:: mutability_to_str ( mutability) +
1867
+ token:: ident_to_str ( & ident) ;
1869
1868
// Add type and region parameters
1870
1869
let name = ppaux:: parameterized ( cx. tcx , name, & substs. regions , substs. tps ) ;
1871
1870
1872
- let ( containing_scope,
1873
- definition_span ) = get_namespace_and_span_for_item ( cx, def_id, usage_site_span) ;
1871
+ let ( containing_scope, definition_span ) =
1872
+ get_namespace_and_span_for_item ( cx, def_id, usage_site_span) ;
1874
1873
1875
1874
let file_name = span_start ( cx, definition_span) . file . name ;
1876
1875
let file_metadata = file_metadata ( cx, file_name) ;
0 commit comments