debuginfo: Cleaned up style issues for pull request.

This commit is contained in:
Michael Woerister 2013-07-16 12:17:55 +02:00
parent eed2d0e1f2
commit b2aeb4b04b
28 changed files with 588 additions and 500 deletions

View File

@ -2127,7 +2127,7 @@ pub mod llvm {
AlignInBits: c_ulonglong,
Flags: c_uint ,
Elements: ValueRef,
RunTimeLang : c_uint) -> ValueRef;
RunTimeLang: c_uint) -> ValueRef;
}
}

File diff suppressed because it is too large Load Diff

View File

@ -3731,17 +3731,18 @@ impl VariantInfo {
},
ast::struct_variant_kind(ref struct_def) => {
let fields : &[@struct_field] = struct_def.fields;
let fields: &[@struct_field] = struct_def.fields;
assert!(fields.len() > 0);
let arg_tys = ty_fn_args(ctor_ty).map(|a| *a);
let arg_names = do fields.map |field| {
match field.node.kind {
named_field(ident, _visibility) => ident,
named_field(ident, _) => ident,
unnamed_field => cx.sess.bug(
"enum_variants: all fields in struct must have a name")
}};
}
};
return VariantInfo {
args: arg_tys,
@ -3904,7 +3905,7 @@ pub fn enum_variants(cx: ctxt, id: ast::def_id) -> @~[@VariantInfo] {
node: ast::item_enum(ref enum_definition, _),
_
}, _) => {
let mut last_discriminant : Option<int> = None;
let mut last_discriminant: Option<int> = None;
@enum_definition.variants.iter().transform(|variant| {
let mut discriminant = match last_discriminant {
@ -3914,8 +3915,13 @@ pub fn enum_variants(cx: ctxt, id: ast::def_id) -> @~[@VariantInfo] {
match variant.node.disr_expr {
Some(e) => match const_eval::eval_const_expr_partial(cx, e) {
Ok(const_eval::const_int(val)) => { discriminant = val as int; }
_ => {}
Ok(const_eval::const_int(val)) => discriminant = val as int,
Ok(_) => {
cx.sess.span_err(e.span, "expected signed integer constant");
}
Err(ref err) => {
cx.sess.span_err(e.span, fmt!("expected constant: %s", (*err)));
}
},
None => {}
};

View File

@ -3138,9 +3138,9 @@ pub fn check_enum_variants(ccx: @mut CrateCtxt,
-> ~[@ty::VariantInfo] {
let rty = ty::node_id_to_type(ccx.tcx, id);
let mut variants : ~[@ty::VariantInfo] = ~[];
let mut variants: ~[@ty::VariantInfo] = ~[];
let mut disr_vals: ~[int] = ~[];
let mut prev_disr_val : Option<int> = None;
let mut prev_disr_val: Option<int> = None;
for vs.iter().advance |v| {
@ -3163,7 +3163,7 @@ pub fn check_enum_variants(ccx: @mut CrateCtxt,
// handle, so we may still get an internal compiler error
match const_eval::eval_const_expr_partial(&ccx.tcx, e) {
Ok(const_eval::const_int(val)) => { current_disr_val = val as int; }
Ok(const_eval::const_int(val)) => current_disr_val = val as int,
Ok(_) => {
ccx.tcx.sess.span_err(e.span, "expected signed integer constant");
}

View File

@ -64,49 +64,49 @@
fn main() {
let bool_val: bool = true;
let bool_ref : &bool = &bool_val;
let bool_ref: &bool = &bool_val;
let int_val: int = -1;
let int_ref : &int = &int_val;
let int_ref: &int = &int_val;
let char_val: char = 'a';
let char_ref : &char = &char_val;
let char_ref: &char = &char_val;
let i8_val: i8 = 68;
let i8_ref : &i8 = &i8_val;
let i8_ref: &i8 = &i8_val;
let i16_val: i16 = -16;
let i16_ref : &i16 = &i16_val;
let i16_ref: &i16 = &i16_val;
let i32_val: i32 = -32;
let i32_ref : &i32 = &i32_val;
let i32_ref: &i32 = &i32_val;
let uint_val: i64 = -64;
let i64_ref : &i64 = &uint_val;
let i64_ref: &i64 = &uint_val;
let uint_val: uint = 1;
let uint_ref : &uint = &uint_val;
let uint_ref: &uint = &uint_val;
let u8_val: u8 = 100;
let u8_ref : &u8 = &u8_val;
let u8_ref: &u8 = &u8_val;
let u16_val: u16 = 16;
let u16_ref : &u16 = &u16_val;
let u16_ref: &u16 = &u16_val;
let u32_val: u32 = 32;
let u32_ref : &u32 = &u32_val;
let u32_ref: &u32 = &u32_val;
let u64_val: u64 = 64;
let u64_ref : &u64 = &u64_val;
let u64_ref: &u64 = &u64_val;
let float_val: float = 1.5;
let float_ref : &float = &float_val;
let float_ref: &float = &float_val;
let f32_val: f32 = 2.5;
let f32_ref : &f32 = &f32_val;
let f32_ref: &f32 = &f32_val;
let f64_val: f64 = 3.5;
let f64_ref : &f64 = &f64_val;
let f64_ref: &f64 = &f64_val;
zzz();
}

View File

@ -28,13 +28,13 @@ enum ABC { TheA, TheB, TheC }
fn main() {
let the_a = TheA;
let the_a_ref : &ABC = &the_a;
let the_a_ref: &ABC = &the_a;
let the_b = TheB;
let the_b_ref : &ABC = &the_b;
let the_b_ref: &ABC = &the_b;
let the_c = TheC;
let the_c_ref : &ABC = &the_c;
let the_c_ref: &ABC = &the_c;
zzz();
}

View File

@ -44,17 +44,17 @@ fn main() {
// 0b0111110001111100 = 31868
// 0b01111100 = 124
let the_a = TheA { x: 0, y: 8970181431921507452 };
let the_a_ref : &ABC = &the_a;
let the_a_ref: &ABC = &the_a;
// 0b0001000100010001000100010001000100010001000100010001000100010001 = 1229782938247303441
// 0b00010001000100010001000100010001 = 286331153
// 0b0001000100010001 = 4369
// 0b00010001 = 17
let the_b = TheB (0, 286331153, 286331153);
let the_b_ref : &ABC = &the_b;
let the_b_ref: &ABC = &the_b;
let univariant = TheOnlyCase(4820353753753434);
let univariant_ref : &Univariant = &univariant;
let univariant_ref: &Univariant = &univariant;
zzz();
}

View File

@ -65,49 +65,49 @@
fn main() {
let bool_box: @bool = @true;
let bool_ref : &bool = bool_box;
let bool_ref: &bool = bool_box;
let int_box: @int = @-1;
let int_ref : &int = int_box;
let int_ref: &int = int_box;
let char_box: @char = @'a';
let char_ref : &char = char_box;
let char_ref: &char = char_box;
let i8_box: @i8 = @68;
let i8_ref : &i8 = i8_box;
let i8_ref: &i8 = i8_box;
let i16_box: @i16 = @-16;
let i16_ref : &i16 = i16_box;
let i16_ref: &i16 = i16_box;
let i32_box: @i32 = @-32;
let i32_ref : &i32 = i32_box;
let i32_ref: &i32 = i32_box;
let i64_box: @i64 = @-64;
let i64_ref : &i64 = i64_box;
let i64_ref: &i64 = i64_box;
let uint_box: @uint = @1;
let uint_ref : &uint = uint_box;
let uint_ref: &uint = uint_box;
let u8_box: @u8 = @100;
let u8_ref : &u8 = u8_box;
let u8_ref: &u8 = u8_box;
let u16_box: @u16 = @16;
let u16_ref : &u16 = u16_box;
let u16_ref: &u16 = u16_box;
let u32_box: @u32 = @32;
let u32_ref : &u32 = u32_box;
let u32_ref: &u32 = u32_box;
let u64_box: @u64 = @64;
let u64_ref : &u64 = u64_box;
let u64_ref: &u64 = u64_box;
let float_box: @float = @1.5;
let float_ref : &float = float_box;
let float_ref: &float = float_box;
let f32_box: @f32 = @2.5;
let f32_ref : &f32 = f32_box;
let f32_ref: &f32 = f32_box;
let f64_box: @f64 = @3.5;
let f64_ref : &f64 = f64_box;
let f64_ref: &f64 = f64_box;
zzz();
}

View File

@ -54,20 +54,20 @@ struct SomeStruct {
fn main() {
let stack_val: SomeStruct = SomeStruct { x: 10, y: 23.5 };
let stack_val_ref : &SomeStruct = &stack_val;
let stack_val_interior_ref_1 : &int = &stack_val.x;
let stack_val_interior_ref_2 : &f64 = &stack_val.y;
let ref_to_unnamed : &SomeStruct = &SomeStruct { x: 11, y: 24.5 };
let stack_val_ref: &SomeStruct = &stack_val;
let stack_val_interior_ref_1: &int = &stack_val.x;
let stack_val_interior_ref_2: &f64 = &stack_val.y;
let ref_to_unnamed: &SomeStruct = &SomeStruct { x: 11, y: 24.5 };
let managed_val = @SomeStruct { x: 12, y: 25.5 };
let managed_val_ref : &SomeStruct = managed_val;
let managed_val_interior_ref_1 : &int = &managed_val.x;
let managed_val_interior_ref_2 : &f64 = &managed_val.y;
let managed_val_ref: &SomeStruct = managed_val;
let managed_val_interior_ref_1: &int = &managed_val.x;
let managed_val_interior_ref_2: &f64 = &managed_val.y;
let unique_val = ~SomeStruct { x: 13, y: 26.5 };
let unique_val_ref : &SomeStruct = unique_val;
let unique_val_interior_ref_1 : &int = &unique_val.x;
let unique_val_interior_ref_2 : &f64 = &unique_val.y;
let unique_val_ref: &SomeStruct = unique_val;
let unique_val_interior_ref_1: &int = &unique_val.x;
let unique_val_interior_ref_2: &f64 = &unique_val.y;
zzz();
}

View File

@ -29,14 +29,14 @@
fn main() {
let stack_val: (i16, f32) = (-14, -19f32);
let stack_val_ref : &(i16, f32) = &stack_val;
let ref_to_unnamed : &(i16, f32) = &(-15, -20f32);
let stack_val_ref: &(i16, f32) = &stack_val;
let ref_to_unnamed: &(i16, f32) = &(-15, -20f32);
let managed_val : @(i16, f32) = @(-16, -21f32);
let managed_val_ref : &(i16, f32) = managed_val;
let managed_val: @(i16, f32) = @(-16, -21f32);
let managed_val_ref: &(i16, f32) = managed_val;
let unique_val: ~(i16, f32) = ~(-17, -22f32);
let unique_val_ref : &(i16, f32) = unique_val;
let unique_val_ref: &(i16, f32) = unique_val;
zzz();
}

View File

@ -65,49 +65,49 @@
fn main() {
let bool_box: ~bool = ~true;
let bool_ref : &bool = bool_box;
let bool_ref: &bool = bool_box;
let int_box: ~int = ~-1;
let int_ref : &int = int_box;
let int_ref: &int = int_box;
let char_box: ~char = ~'a';
let char_ref : &char = char_box;
let char_ref: &char = char_box;
let i8_box: ~i8 = ~68;
let i8_ref : &i8 = i8_box;
let i8_ref: &i8 = i8_box;
let i16_box: ~i16 = ~-16;
let i16_ref : &i16 = i16_box;
let i16_ref: &i16 = i16_box;
let i32_box: ~i32 = ~-32;
let i32_ref : &i32 = i32_box;
let i32_ref: &i32 = i32_box;
let i64_box: ~i64 = ~-64;
let i64_ref : &i64 = i64_box;
let i64_ref: &i64 = i64_box;
let uint_box: ~uint = ~1;
let uint_ref : &uint = uint_box;
let uint_ref: &uint = uint_box;
let u8_box: ~u8 = ~100;
let u8_ref : &u8 = u8_box;
let u8_ref: &u8 = u8_box;
let u16_box: ~u16 = ~16;
let u16_ref : &u16 = u16_box;
let u16_ref: &u16 = u16_box;
let u32_box: ~u32 = ~32;
let u32_ref : &u32 = u32_box;
let u32_ref: &u32 = u32_box;
let u64_box: ~u64 = ~64;
let u64_ref : &u64 = u64_box;
let u64_ref: &u64 = u64_box;
let float_box: ~float = ~1.5;
let float_ref : &float = float_box;
let float_ref: &float = float_box;
let f32_box: ~f32 = ~2.5;
let f32_ref : &f32 = f32_box;
let f32_ref: &f32 = f32_box;
let f64_box: ~f64 = ~3.5;
let f64_ref : &f64 = f64_box;
let f64_ref: &f64 = f64_box;
zzz();
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print pretty off
// debugger:break _zzz

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run
@ -25,8 +27,8 @@
fn main() {
let managed : @[i64] = @[7, 8, 9];
let unique : ~[i64] = ~[10, 11, 12, 13];
let managed: @[i64] = @[7, 8, 9];
let unique: ~[i64] = ~[10, 11, 12, 13];
zzz();
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run

View File

@ -22,7 +22,7 @@
// check:$2 = false
fn main() {
let (a, b) : (int, bool) = (9898, false);
let (a, b): (int, bool) = (9898, false);
zzz();
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print pretty off
// debugger:break zzz

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run
@ -28,8 +30,8 @@ enum AnotherNilEnum {}
// 2. That gdb prints the string "{<No data fields>}" for empty structs (which may change some time)
fn main() {
unsafe {
let first : ANilEnum = std::cast::transmute(());
let second : AnotherNilEnum = std::cast::transmute(());
let first: ANilEnum = std::cast::transmute(());
let second: AnotherNilEnum = std::cast::transmute(());
zzz();
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run
@ -49,8 +51,8 @@ enum NamedFields<'self> {
fn main() {
let some : Option<&u32> = Some(unsafe { std::cast::transmute(0x12345678) });
let none : Option<&u32> = None;
let some: Option<&u32> = Some(unsafe { std::cast::transmute(0x12345678) });
let none: Option<&u32> = None;
let full = Full(454545, unsafe { std::cast::transmute(0x87654321) }, 9988);

View File

@ -35,15 +35,15 @@
fn main() {
let noPadding8 : (i8, u8) = (-100, 100);
let noPadding16 : (i16, i16, u16) = (0, 1, 2);
let noPadding32 : (i32, f32, u32) = (3, 4.5, 5);
let noPadding64 : (i64, f64, u64) = (6, 7.5, 8);
let noPadding8: (i8, u8) = (-100, 100);
let noPadding16: (i16, i16, u16) = (0, 1, 2);
let noPadding32: (i32, f32, u32) = (3, 4.5, 5);
let noPadding64: (i64, f64, u64) = (6, 7.5, 8);
let internalPadding1 : (i16, i32) = (9, 10);
let internalPadding2 : (i16, i32, u32, u64) = (11, 12, 13, 14);
let internalPadding1: (i16, i32) = (9, 10);
let internalPadding2: (i16, i32, u32, u64) = (11, 12, 13, 14);
let paddingAtEnd : (i32, i16) = (15, 16);
let paddingAtEnd: (i32, i16) = (15, 16);
zzz();
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print union on
// debugger:break zzz

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print union on
// debugger:break zzz

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:break zzz
// debugger:run
@ -29,13 +31,13 @@
struct NoDestructor {
x : i32,
y : i64
x: i32,
y: i64
}
struct WithDestructor {
x : i32,
y : i64
x: i32,
y: i64
}
impl Drop for WithDestructor {

View File

@ -34,15 +34,15 @@
// check:$7 = {{21, 22}, 23}
fn main() {
let no_padding1 : ((u32, u32), u32, u32) = ((0, 1), 2, 3);
let no_padding2 : (u32, (u32, u32), u32) = (4, (5, 6), 7);
let no_padding3 : (u32, u32, (u32, u32)) = (8, 9, (10, 11));
let no_padding1: ((u32, u32), u32, u32) = ((0, 1), 2, 3);
let no_padding2: (u32, (u32, u32), u32) = (4, (5, 6), 7);
let no_padding3: (u32, u32, (u32, u32)) = (8, 9, (10, 11));
let internal_padding1 : (i16, (i32, i32)) = (12, (13, 14));
let internal_padding2 : (i16, (i16, i32)) = (15, (16, 17));
let internal_padding1: (i16, (i32, i32)) = (12, (13, 14));
let internal_padding2: (i16, (i16, i32)) = (15, (16, 17));
let padding_at_end1 : (i32, (i32, i16)) = (18, (19, 20));
let padding_at_end2 : ((i32, i16), i32) = ((21, 22), 23);
let padding_at_end1: (i32, (i32, i16)) = (18, (19, 20));
let padding_at_end2: ((i32, i16), i32) = ((21, 22), 23);
zzz();
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print union on
// debugger:break zzz

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print pretty off
// debugger:break zzz
@ -52,14 +54,14 @@ struct AStruct {
}
fn main() {
let empty : &[i64] = &[];
let singleton : &[i64] = &[1];
let multiple : &[i64] = &[2, 3, 4, 5];
let empty: &[i64] = &[];
let singleton: &[i64] = &[1];
let multiple: &[i64] = &[2, 3, 4, 5];
let slice_of_slice = multiple.slice(1,3);
let padded_tuple : &[(i32, i16)] = &[(6, 7), (8, 9)];
let padded_tuple: &[(i32, i16)] = &[(6, 7), (8, 9)];
let padded_struct : &[AStruct] = &[
let padded_struct: &[AStruct] = &[
AStruct { x: 10, y: 11, z: 12 },
AStruct { x: 13, y: 14, z: 15 }
];

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249
// compile-flags:-Z extra-debug-info
// debugger:set print pretty off
// debugger:break zzz