Skip to content

Commit e3c2d46

Browse files
miliboppmilibopp
committed
Add trailing ';' to all item macros
This is a fix for the latest nightly, see rust-lang/rust#19984.
1 parent fec0c74 commit e3c2d46

19 files changed

+1169
-1169
lines changed

‎src/macros/assert.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ macro_rules! assert_approx_eq_eps(
1111
)
1212
}
1313
})
14-
)
14+
);
1515

1616
/// Asserts approximate equality of two values with the `ApproxEq` trait.
1717
#[macro_export]
@@ -25,4 +25,4 @@ macro_rules! assert_approx_eq(
2525
)
2626
}
2727
})
28-
)
28+
);

‎src/structs/dvec.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ impl<N> FromIterator<N> for DVec<N> {
7777
}
7878

7979

80-
dvec_impl!(DVec)
80+
dvec_impl!(DVec);
8181

8282
/// Stack-allocated, dynamically sized vector with a maximum size of 1.
8383
pub struct DVec1<N> {
8484
at: [N, ..1],
8585
dim: uint
8686
}
8787

88-
small_dvec_impl!(DVec1, 1, 0)
89-
small_dvec_from_impl!(DVec1, 1, ::zero())
88+
small_dvec_impl!(DVec1, 1, 0);
89+
small_dvec_from_impl!(DVec1, 1, ::zero());
9090

9191

9292
/// Stack-allocated, dynamically sized vector with a maximum size of 2.
@@ -95,8 +95,8 @@ pub struct DVec2<N> {
9595
dim: uint
9696
}
9797

98-
small_dvec_impl!(DVec2, 2, 0, 1)
99-
small_dvec_from_impl!(DVec2, 2, ::zero(), ::zero())
98+
small_dvec_impl!(DVec2, 2, 0, 1);
99+
small_dvec_from_impl!(DVec2, 2, ::zero(), ::zero());
100100

101101

102102
/// Stack-allocated, dynamically sized vector with a maximum size of 3.
@@ -105,8 +105,8 @@ pub struct DVec3<N> {
105105
dim: uint
106106
}
107107

108-
small_dvec_impl!(DVec3, 3, 0, 1, 2)
109-
small_dvec_from_impl!(DVec3, 3, ::zero(), ::zero(), ::zero())
108+
small_dvec_impl!(DVec3, 3, 0, 1, 2);
109+
small_dvec_from_impl!(DVec3, 3, ::zero(), ::zero(), ::zero());
110110

111111

112112
/// Stack-allocated, dynamically sized vector with a maximum size of 4.
@@ -115,8 +115,8 @@ pub struct DVec4<N> {
115115
dim: uint
116116
}
117117

118-
small_dvec_impl!(DVec4, 4, 0, 1, 2, 3)
119-
small_dvec_from_impl!(DVec4, 4, ::zero(), ::zero(), ::zero(), ::zero())
118+
small_dvec_impl!(DVec4, 4, 0, 1, 2, 3);
119+
small_dvec_from_impl!(DVec4, 4, ::zero(), ::zero(), ::zero(), ::zero());
120120

121121

122122
/// Stack-allocated, dynamically sized vector with a maximum size of 5.
@@ -125,8 +125,8 @@ pub struct DVec5<N> {
125125
dim: uint
126126
}
127127

128-
small_dvec_impl!(DVec5, 5, 0, 1, 2, 3, 4)
129-
small_dvec_from_impl!(DVec5, 5, ::zero(), ::zero(), ::zero(), ::zero(), ::zero())
128+
small_dvec_impl!(DVec5, 5, 0, 1, 2, 3, 4);
129+
small_dvec_from_impl!(DVec5, 5, ::zero(), ::zero(), ::zero(), ::zero(), ::zero());
130130

131131

132132
/// Stack-allocated, dynamically sized vector with a maximum size of 6.
@@ -135,5 +135,5 @@ pub struct DVec6<N> {
135135
dim: uint
136136
}
137137

138-
small_dvec_impl!(DVec6, 6, 0, 1, 2, 3, 4, 5)
139-
small_dvec_from_impl!(DVec6, 6, ::zero(), ::zero(), ::zero(), ::zero(), ::zero(), ::zero())
138+
small_dvec_impl!(DVec6, 6, 0, 1, 2, 3, 4, 5);
139+
small_dvec_from_impl!(DVec6, 6, ::zero(), ::zero(), ::zero(), ::zero(), ::zero(), ::zero());

‎src/structs/dvec_macros.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ macro_rules! dvec_impl(
359359
}
360360
}
361361
)
362-
)
362+
);
363363

364364
macro_rules! small_dvec_impl (
365365
($dvec: ident, $dim: expr $(,$idx: expr)*) => (
@@ -398,9 +398,9 @@ macro_rules! small_dvec_impl (
398398
}
399399
}
400400

401-
dvec_impl!($dvec)
401+
dvec_impl!($dvec);
402402
)
403-
)
403+
);
404404

405405
macro_rules! small_dvec_from_impl (
406406
($dvec: ident, $dim: expr $(,$zeros: expr)*) => (
@@ -488,4 +488,4 @@ macro_rules! small_dvec_from_impl (
488488
}
489489
}
490490
)
491-
)
491+
);

‎src/structs/iso.rs

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -92,59 +92,59 @@ impl<N> Iso4<N> {
9292
}
9393
}
9494

95-
iso_impl!(Iso2, Rot2, Vec2, Vec1)
96-
rotation_matrix_impl!(Iso2, Rot2, Vec2, Vec1)
97-
rotation_impl!(Iso2, Rot2, Vec1)
98-
dim_impl!(Iso2, 2)
99-
one_impl!(Iso2)
100-
absolute_rotate_impl!(Iso2, Vec2)
101-
rand_impl!(Iso2)
102-
approx_eq_impl!(Iso2)
103-
to_homogeneous_impl!(Iso2, Mat3)
104-
inv_impl!(Iso2)
105-
transform_impl!(Iso2, Pnt2)
106-
transformation_impl!(Iso2)
107-
rotate_impl!(Iso2, Vec2)
108-
translation_impl!(Iso2, Vec2)
109-
translate_impl!(Iso2, Pnt2)
110-
iso_mul_iso_impl!(Iso2)
111-
iso_mul_pnt_impl!(Iso2, Pnt2)
112-
pnt_mul_iso_impl!(Iso2, Pnt2)
95+
iso_impl!(Iso2, Rot2, Vec2, Vec1);
96+
rotation_matrix_impl!(Iso2, Rot2, Vec2, Vec1);
97+
rotation_impl!(Iso2, Rot2, Vec1);
98+
dim_impl!(Iso2, 2);
99+
one_impl!(Iso2);
100+
absolute_rotate_impl!(Iso2, Vec2);
101+
rand_impl!(Iso2);
102+
approx_eq_impl!(Iso2);
103+
to_homogeneous_impl!(Iso2, Mat3);
104+
inv_impl!(Iso2);
105+
transform_impl!(Iso2, Pnt2);
106+
transformation_impl!(Iso2);
107+
rotate_impl!(Iso2, Vec2);
108+
translation_impl!(Iso2, Vec2);
109+
translate_impl!(Iso2, Pnt2);
110+
iso_mul_iso_impl!(Iso2);
111+
iso_mul_pnt_impl!(Iso2, Pnt2);
112+
pnt_mul_iso_impl!(Iso2, Pnt2);
113113

114-
iso_impl!(Iso3, Rot3, Vec3, Vec3)
115-
rotation_matrix_impl!(Iso3, Rot3, Vec3, Vec3)
116-
rotation_impl!(Iso3, Rot3, Vec3)
117-
dim_impl!(Iso3, 3)
118-
one_impl!(Iso3)
119-
absolute_rotate_impl!(Iso3, Vec3)
120-
rand_impl!(Iso3)
121-
approx_eq_impl!(Iso3)
122-
to_homogeneous_impl!(Iso3, Mat4)
123-
inv_impl!(Iso3)
124-
transform_impl!(Iso3, Pnt3)
125-
transformation_impl!(Iso3)
126-
rotate_impl!(Iso3, Vec3)
127-
translation_impl!(Iso3, Vec3)
128-
translate_impl!(Iso3, Pnt3)
129-
iso_mul_iso_impl!(Iso3)
130-
iso_mul_pnt_impl!(Iso3, Pnt3)
131-
pnt_mul_iso_impl!(Iso3, Pnt3)
114+
iso_impl!(Iso3, Rot3, Vec3, Vec3);
115+
rotation_matrix_impl!(Iso3, Rot3, Vec3, Vec3);
116+
rotation_impl!(Iso3, Rot3, Vec3);
117+
dim_impl!(Iso3, 3);
118+
one_impl!(Iso3);
119+
absolute_rotate_impl!(Iso3, Vec3);
120+
rand_impl!(Iso3);
121+
approx_eq_impl!(Iso3);
122+
to_homogeneous_impl!(Iso3, Mat4);
123+
inv_impl!(Iso3);
124+
transform_impl!(Iso3, Pnt3);
125+
transformation_impl!(Iso3);
126+
rotate_impl!(Iso3, Vec3);
127+
translation_impl!(Iso3, Vec3);
128+
translate_impl!(Iso3, Pnt3);
129+
iso_mul_iso_impl!(Iso3);
130+
iso_mul_pnt_impl!(Iso3, Pnt3);
131+
pnt_mul_iso_impl!(Iso3, Pnt3);
132132

133-
// iso_impl!(Iso4, Rot4, Vec4, Vec4)
134-
// rotation_matrix_impl!(Iso4, Rot4, Vec4, Vec4)
135-
// rotation_impl!(Iso4, Rot4, Vec4)
136-
dim_impl!(Iso4, 4)
137-
one_impl!(Iso4)
138-
absolute_rotate_impl!(Iso4, Vec4)
139-
// rand_impl!(Iso4)
140-
approx_eq_impl!(Iso4)
141-
to_homogeneous_impl!(Iso4, Mat5)
142-
inv_impl!(Iso4)
143-
transform_impl!(Iso4, Pnt4)
144-
transformation_impl!(Iso4)
145-
rotate_impl!(Iso4, Vec4)
146-
translation_impl!(Iso4, Vec4)
147-
translate_impl!(Iso4, Pnt4)
148-
iso_mul_iso_impl!(Iso4)
149-
iso_mul_pnt_impl!(Iso4, Pnt4)
150-
pnt_mul_iso_impl!(Iso4, Pnt4)
133+
// iso_impl!(Iso4, Rot4, Vec4, Vec4);
134+
// rotation_matrix_impl!(Iso4, Rot4, Vec4, Vec4);
135+
// rotation_impl!(Iso4, Rot4, Vec4);
136+
dim_impl!(Iso4, 4);
137+
one_impl!(Iso4);
138+
absolute_rotate_impl!(Iso4, Vec4);
139+
// rand_impl!(Iso4);
140+
approx_eq_impl!(Iso4);
141+
to_homogeneous_impl!(Iso4, Mat5);
142+
inv_impl!(Iso4);
143+
transform_impl!(Iso4, Pnt4);
144+
transformation_impl!(Iso4);
145+
rotate_impl!(Iso4, Vec4);
146+
translation_impl!(Iso4, Vec4);
147+
translate_impl!(Iso4, Pnt4);
148+
iso_mul_iso_impl!(Iso4);
149+
iso_mul_pnt_impl!(Iso4, Pnt4);
150+
pnt_mul_iso_impl!(Iso4, Pnt4);

‎src/structs/iso_macros.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ macro_rules! iso_impl(
2222
}
2323
}
2424
)
25-
)
25+
);
2626

2727
macro_rules! rotation_matrix_impl(
2828
($t: ident, $trot: ident, $tlv: ident, $tav: ident) => (
@@ -34,7 +34,7 @@ macro_rules! rotation_matrix_impl(
3434
}
3535
}
3636
)
37-
)
37+
);
3838

3939

4040
macro_rules! dim_impl(
@@ -46,7 +46,7 @@ macro_rules! dim_impl(
4646
}
4747
}
4848
)
49-
)
49+
);
5050

5151
macro_rules! one_impl(
5252
($t: ident) => (
@@ -57,7 +57,7 @@ macro_rules! one_impl(
5757
}
5858
}
5959
)
60-
)
60+
);
6161

6262
macro_rules! iso_mul_iso_impl(
6363
($t: ident) => (
@@ -70,7 +70,7 @@ macro_rules! iso_mul_iso_impl(
7070
}
7171
}
7272
)
73-
)
73+
);
7474

7575
macro_rules! iso_mul_pnt_impl(
7676
($t: ident, $tv: ident) => (
@@ -81,7 +81,7 @@ macro_rules! iso_mul_pnt_impl(
8181
}
8282
}
8383
)
84-
)
84+
);
8585

8686
macro_rules! pnt_mul_iso_impl(
8787
($t: ident, $tv: ident) => (
@@ -92,7 +92,7 @@ macro_rules! pnt_mul_iso_impl(
9292
}
9393
}
9494
)
95-
)
95+
);
9696

9797
macro_rules! translation_impl(
9898
($t: ident, $tv: ident) => (
@@ -133,7 +133,7 @@ macro_rules! translation_impl(
133133
}
134134
}
135135
)
136-
)
136+
);
137137

138138
macro_rules! translate_impl(
139139
($t: ident, $tv: ident) => (
@@ -149,7 +149,7 @@ macro_rules! translate_impl(
149149
}
150150
}
151151
)
152-
)
152+
);
153153

154154
macro_rules! rotation_impl(
155155
($t: ident, $trot: ident, $tav: ident) => (
@@ -200,7 +200,7 @@ macro_rules! rotation_impl(
200200
}
201201
}
202202
)
203-
)
203+
);
204204

205205
macro_rules! rotate_impl(
206206
($t: ident, $tv: ident) => (
@@ -216,7 +216,7 @@ macro_rules! rotate_impl(
216216
}
217217
}
218218
)
219-
)
219+
);
220220

221221
macro_rules! transformation_impl(
222222
($t: ident) => (
@@ -251,7 +251,7 @@ macro_rules! transformation_impl(
251251
}
252252
}
253253
)
254-
)
254+
);
255255

256256
macro_rules! transform_impl(
257257
($t: ident, $tp: ident) => (
@@ -267,7 +267,7 @@ macro_rules! transform_impl(
267267
}
268268
}
269269
)
270-
)
270+
);
271271

272272
macro_rules! inv_impl(
273273
($t: ident) => (
@@ -289,7 +289,7 @@ macro_rules! inv_impl(
289289
}
290290
}
291291
)
292-
)
292+
);
293293

294294
macro_rules! to_homogeneous_impl(
295295
($t: ident, $th: ident) => (
@@ -306,7 +306,7 @@ macro_rules! to_homogeneous_impl(
306306
}
307307
}
308308
)
309-
)
309+
);
310310

311311
macro_rules! approx_eq_impl(
312312
($t: ident) => (
@@ -323,7 +323,7 @@ macro_rules! approx_eq_impl(
323323
}
324324
}
325325
)
326-
)
326+
);
327327

328328
macro_rules! rand_impl(
329329
($t: ident) => (
@@ -334,7 +334,7 @@ macro_rules! rand_impl(
334334
}
335335
}
336336
)
337-
)
337+
);
338338

339339
macro_rules! absolute_rotate_impl(
340340
($t: ident, $tv: ident) => (
@@ -345,4 +345,4 @@ macro_rules! absolute_rotate_impl(
345345
}
346346
}
347347
)
348-
)
348+
);

0 commit comments

Comments
 (0)