Skip to content

Commit d487488

Browse files
---
yaml --- r: 63767 b: refs/heads/snap-stage3 c: 1dc8e76 h: refs/heads/master i: 63765: 61d2a63 63763: 0901e24 63759: cbc00fb v: v3
1 parent ee34756 commit d487488

File tree

5 files changed

+65
-65
lines changed

5 files changed

+65
-65
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 4d8f2fd8714b983aa8ae5d697c90998424930f5b
4+
refs/heads/snap-stage3: 1dc8e76d3a32fbb304b152f815d394577fe008c6
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/debug-info/simple-struct.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@
1616
// debugger:run
1717
// debugger:finish
1818

19-
// debugger:print noPadding16
19+
// debugger:print no_padding16
2020
// check:$1 = {x = 10000, y = -10001}
2121

22-
// debugger:print noPadding32
22+
// debugger:print no_padding32
2323
// check:$2 = {x = -10002, y = -10003.5, z = 10004}
2424

25-
// debugger:print noPadding64
25+
// debugger:print no_padding64
2626
// check:$3 = {x = -10005.5, y = 10006, z = 10007}
2727

28-
// debugger:print noPadding163264
28+
// debugger:print no_padding163264
2929
// check:$4 = {a = -10008, b = 10009, c = 10010, d = 10011}
3030

31-
// debugger:print internalPadding
31+
// debugger:print internal_padding
3232
// check:$5 = {x = 10012, y = -10013}
3333

34-
// debugger:print paddingAtEnd
34+
// debugger:print padding_at_end
3535
// check:$6 = {x = -10014, y = 10015}
3636

3737

3838
struct NoPadding16 {
3939
x: u16,
4040
y: i16
4141
}
42-
42+
4343
struct NoPadding32 {
4444
x: i32,
4545
y: f32,
@@ -70,13 +70,13 @@ struct PaddingAtEnd {
7070
}
7171

7272
fn main() {
73-
let noPadding16 = NoPadding16 { x: 10000, y: -10001 };
74-
let noPadding32 = NoPadding32 { x: -10002, y: -10003.5, z: 10004 };
75-
let noPadding64 = NoPadding64 { x: -10005.5, y: 10006, z: 10007 };
76-
let noPadding163264 = NoPadding163264 { a: -10008, b: 10009, c: 10010, d: 10011 };
77-
78-
let internalPadding = InternalPadding { x: 10012, y: -10013 };
79-
let paddingAtEnd = PaddingAtEnd { x: -10014, y: 10015 };
73+
let no_padding16 = NoPadding16 { x: 10000, y: -10001 };
74+
let no_padding32 = NoPadding32 { x: -10002, y: -10003.5, z: 10004 };
75+
let no_padding64 = NoPadding64 { x: -10005.5, y: 10006, z: 10007 };
76+
let no_padding163264 = NoPadding163264 { a: -10008, b: 10009, c: 10010, d: 10011 };
77+
78+
let internal_padding = InternalPadding { x: 10012, y: -10013 };
79+
let padding_at_end = PaddingAtEnd { x: -10014, y: 10015 };
8080

8181
zzz();
8282
}

branches/snap-stage3/src/test/debug-info/struct-in-struct.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct InternalPaddingParent {
5555
struct PaddingAtEndParent {
5656
x: PaddingAtEnd,
5757
y: PaddingAtEnd,
58-
z: PaddingAtEnd
58+
z: PaddingAtEnd
5959
}
6060

6161
struct Mixed {
@@ -84,7 +84,7 @@ struct Tree {
8484
}
8585

8686
fn main() {
87-
87+
8888
let three_simple_structs = ThreeSimpleStructs {
8989
x: Simple { x: 1 },
9090
y: Simple { x: 2 },
@@ -100,7 +100,7 @@ fn main() {
100100
let padding_at_end_parent = PaddingAtEndParent {
101101
x: PaddingAtEnd { x: 10, y: 11 },
102102
y: PaddingAtEnd { x: 12, y: 13 },
103-
z: PaddingAtEnd { x: 14, y: 15 }
103+
z: PaddingAtEnd { x: 14, y: 15 }
104104
};
105105

106106
let mixed = Mixed {
@@ -111,22 +111,22 @@ fn main() {
111111
};
112112

113113
let bag = Bag { x: Simple { x: 22 } };
114-
let bag_in_bag = BagInBag
114+
let bag_in_bag = BagInBag
115115
{
116-
x: Bag
116+
x: Bag
117117
{
118-
x: Simple { x: 23 }
119-
}
118+
x: Simple { x: 23 }
119+
}
120120
};
121121

122-
let tjo = ThatsJustOverkill
122+
let tjo = ThatsJustOverkill
123123
{
124-
x: BagInBag
124+
x: BagInBag
125125
{
126-
x: Bag
126+
x: Bag
127127
{
128-
x: Simple { x: 24 }
129-
}
128+
x: Simple { x: 24 }
129+
}
130130
}
131131
};
132132

@@ -138,12 +138,12 @@ fn main() {
138138
y: InternalPadding { x: 28, y: 29 },
139139
z: InternalPadding { x: 30, y: 31 }
140140
},
141-
z: BagInBag
141+
z: BagInBag
142142
{
143-
x: Bag
143+
x: Bag
144144
{
145-
x: Simple { x: 32 }
146-
}
145+
x: Simple { x: 32 }
146+
}
147147
}
148148
};
149149

branches/snap-stage3/src/test/debug-info/tuple-in-struct.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@
1616
// debugger:run
1717
// debugger:finish
1818

19-
// debugger:print noPadding1
19+
// debugger:print no_padding1
2020
// check:$1 = {x = {0, 1}, y = 2, z = {3, 4, 5}}
21-
// debugger:print noPadding2
21+
// debugger:print no_padding2
2222
// check:$2 = {x = {6, 7}, y = {{8, 9}, 10}}
2323

24-
// debugger:print tupleInternalPadding
24+
// debugger:print tuple_internal_padding
2525
// check:$3 = {x = {11, 12}, y = {13, 14}}
26-
// debugger:print structInternalPadding
26+
// debugger:print struct_internal_padding
2727
// check:$4 = {x = {15, 16}, y = {17, 18}}
28-
// debugger:print bothInternallyPadded
28+
// debugger:print both_internally_padded
2929
// check:$5 = {x = {19, 20, 21}, y = {22, 23}}
3030

31-
// debugger:print singleTuple
31+
// debugger:print single_tuple
3232
// check:$6 = {x = {24, 25, 26}}
3333

34-
// debugger:print tuplePaddedAtEnd
34+
// debugger:print tuple_padded_at_end
3535
// check:$7 = {x = {27, 28}, y = {29, 30}}
36-
// debugger:print structPaddedAtEnd
36+
// debugger:print struct_padded_at_end
3737
// check:$8 = {x = {31, 32}, y = {33, 34}}
38-
// debugger:print bothPaddedAtEnd
38+
// debugger:print both_padded_at_end
3939
// check:$9 = {x = {35, 36, 37}, y = {38, 39}}
4040

41-
// debugger:print mixedPadding
41+
// debugger:print mixed_padding
4242
// check:$10 = {x = {{40, 41, 42}, {43, 44}}, y = {45, 46, 47, 48}}
4343

4444
struct NoPadding1 {
@@ -95,52 +95,52 @@ struct MixedPadding {
9595

9696

9797
fn main() {
98-
let noPadding1 = NoPadding1 {
98+
let no_padding1 = NoPadding1 {
9999
x: (0, 1),
100100
y: 2,
101101
z: (3, 4, 5)
102102
};
103103

104-
let noPadding2 = NoPadding2 {
104+
let no_padding2 = NoPadding2 {
105105
x: (6, 7),
106106
y: ((8, 9), 10)
107107
};
108108

109-
let tupleInternalPadding = TupleInternalPadding {
109+
let tuple_internal_padding = TupleInternalPadding {
110110
x: (11, 12),
111111
y: (13, 14)
112112
};
113113

114-
let structInternalPadding = StructInternalPadding {
114+
let struct_internal_padding = StructInternalPadding {
115115
x: (15, 16),
116116
y: (17, 18)
117117
};
118118

119-
let bothInternallyPadded = BothInternallyPadded {
119+
let both_internally_padded = BothInternallyPadded {
120120
x: (19, 20, 21),
121121
y: (22, 23)
122122
};
123123

124-
let singleTuple = SingleTuple {
124+
let single_tuple = SingleTuple {
125125
x: (24, 25, 26)
126126
};
127127

128-
let tuplePaddedAtEnd = TuplePaddedAtEnd {
128+
let tuple_padded_at_end = TuplePaddedAtEnd {
129129
x: (27, 28),
130130
y: (29, 30)
131131
};
132132

133-
let structPaddedAtEnd = StructPaddedAtEnd {
133+
let struct_padded_at_end = StructPaddedAtEnd {
134134
x: (31, 32),
135135
y: (33, 34)
136136
};
137137

138-
let bothPaddedAtEnd = BothPaddedAtEnd {
138+
let both_padded_at_end = BothPaddedAtEnd {
139139
x: (35, 36, 37),
140140
y: (38, 39)
141141
};
142142

143-
let mixedPadding = MixedPadding {
143+
let mixed_padding = MixedPadding {
144144
x: ((40, 41, 42), (43, 44)),
145145
y: (45, 46, 47, 48)
146146
};

branches/snap-stage3/src/test/debug-info/tuple-in-tuple.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@
1616
// debugger:run
1717
// debugger:finish
1818

19-
// debugger:print noPadding1
19+
// debugger:print no_padding1
2020
// check:$1 = {{0, 1}, 2, 3}
21-
// debugger:print noPadding2
21+
// debugger:print no_padding2
2222
// check:$2 = {4, {5, 6}, 7}
23-
// debugger:print noPadding3
23+
// debugger:print no_padding3
2424
// check:$3 = {8, 9, {10, 11}}
2525

26-
// debugger:print internalPadding1
26+
// debugger:print internal_padding1
2727
// check:$4 = {12, {13, 14}}
28-
// debugger:print internalPadding2
28+
// debugger:print internal_padding2
2929
// check:$5 = {15, {16, 17}}
3030

31-
// debugger:print paddingAtEnd1
31+
// debugger:print padding_at_end1
3232
// check:$6 = {18, {19, 20}}
33-
// debugger:print paddingAtEnd2
33+
// debugger:print padding_at_end2
3434
// check:$7 = {{21, 22}, 23}
3535

3636
fn main() {
37-
let noPadding1 : ((u32, u32), u32, u32) = ((0, 1), 2, 3);
38-
let noPadding2 : (u32, (u32, u32), u32) = (4, (5, 6), 7);
39-
let noPadding3 : (u32, u32, (u32, u32)) = (8, 9, (10, 11));
37+
let no_padding1 : ((u32, u32), u32, u32) = ((0, 1), 2, 3);
38+
let no_padding2 : (u32, (u32, u32), u32) = (4, (5, 6), 7);
39+
let no_padding3 : (u32, u32, (u32, u32)) = (8, 9, (10, 11));
4040

41-
let internalPadding1 : (i16, (i32, i32)) = (12, (13, 14));
42-
let internalPadding2 : (i16, (i16, i32)) = (15, (16, 17));
41+
let internal_padding1 : (i16, (i32, i32)) = (12, (13, 14));
42+
let internal_padding2 : (i16, (i16, i32)) = (15, (16, 17));
4343

44-
let paddingAtEnd1 : (i32, (i32, i16)) = (18, (19, 20));
45-
let paddingAtEnd2 : ((i32, i16), i32) = ((21, 22), 23);
44+
let padding_at_end1 : (i32, (i32, i16)) = (18, (19, 20));
45+
let padding_at_end2 : ((i32, i16), i32) = ((21, 22), 23);
4646

4747
zzz();
4848
}

0 commit comments

Comments
 (0)