Skip to content

Commit d26b547

Browse files
MingunMingun
authored
Merge pull request #901 from alexanderkjall/fix-test-on-32-bit
fix tests on 32-bit architecture
2 parents 17e575e + bd0d7f4 commit d26b547

File tree

7 files changed

+51
-48
lines changed

7 files changed

+51
-48
lines changed

‎Changelog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424

2525
### Misc Changes
2626

27+
- [#901]: Fix running tests on 32-bit architecture
28+
2729
[#353]: https://github.com/tafia/quick-xml/issues/353
30+
[#901]: https://github.com/tafia/quick-xml/pull/901
2831
[`Serializer::text_format()`]: https://docs.rs/quick-xml/0.38.4/quick_xml/se/struct.Serializer.html#method.text_format
2932

3033

‎src/se/content.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -657,13 +657,13 @@ pub(super) mod tests {
657657
serialize_as!(i16_: -4200i16 => "-4200", Text);
658658
serialize_as!(i32_: -42000000i32 => "-42000000", Text);
659659
serialize_as!(i64_: -42000000000000i64 => "-42000000000000", Text);
660-
serialize_as!(isize_: -42000000000000isize => "-42000000000000", Text);
660+
serialize_as!(isize_: -42000000isize => "-42000000", Text);
661661

662662
serialize_as!(u8_: 42u8 => "42", Text);
663663
serialize_as!(u16_: 4200u16 => "4200", Text);
664664
serialize_as!(u32_: 42000000u32 => "42000000", Text);
665665
serialize_as!(u64_: 42000000000000u64 => "42000000000000", Text);
666-
serialize_as!(usize_: 42000000000000usize => "42000000000000", Text);
666+
serialize_as!(usize_: 42000000usize => "42000000", Text);
667667

668668
serde_if_integer128! {
669669
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
@@ -792,13 +792,13 @@ pub(super) mod tests {
792792
text!(i16_: -4200i16 => "-4200");
793793
text!(i32_: -42000000i32 => "-42000000");
794794
text!(i64_: -42000000000000i64 => "-42000000000000");
795-
text!(isize_: -42000000000000isize => "-42000000000000");
795+
text!(isize_: -42000000isize => "-42000000");
796796

797797
text!(u8_: 42u8 => "42");
798798
text!(u16_: 4200u16 => "4200");
799799
text!(u32_: 42000000u32 => "42000000");
800800
text!(u64_: 42000000000000u64 => "42000000000000");
801-
text!(usize_: 42000000000000usize => "42000000000000");
801+
text!(usize_: 42000000usize => "42000000");
802802

803803
serde_if_integer128! {
804804
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -917,13 +917,13 @@ pub(super) mod tests {
917917
value!(i16_: -4200i16 => "-4200");
918918
value!(i32_: -42000000i32 => "-42000000");
919919
value!(i64_: -42000000000000i64 => "-42000000000000");
920-
value!(isize_: -42000000000000isize => "-42000000000000");
920+
value!(isize_: -42000000isize => "-42000000");
921921

922922
value!(u8_: 42u8 => "42");
923923
value!(u16_: 4200u16 => "4200");
924924
value!(u32_: 42000000u32 => "42000000");
925925
value!(u64_: 42000000000000u64 => "42000000000000");
926-
value!(usize_: 42000000000000usize => "42000000000000");
926+
value!(usize_: 42000000usize => "42000000");
927927

928928
serde_if_integer128! {
929929
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1128,13 +1128,13 @@ pub(super) mod tests {
11281128
serialize_as!(i16_: -4200i16 => "-4200", Text);
11291129
serialize_as!(i32_: -42000000i32 => "-42000000", Text);
11301130
serialize_as!(i64_: -42000000000000i64 => "-42000000000000", Text);
1131-
serialize_as!(isize_: -42000000000000isize => "-42000000000000", Text);
1131+
serialize_as!(isize_: -42000000isize => "-42000000", Text);
11321132

11331133
serialize_as!(u8_: 42u8 => "42", Text);
11341134
serialize_as!(u16_: 4200u16 => "4200", Text);
11351135
serialize_as!(u32_: 42000000u32 => "42000000", Text);
11361136
serialize_as!(u64_: 42000000000000u64 => "42000000000000", Text);
1137-
serialize_as!(usize_: 42000000000000usize => "42000000000000", Text);
1137+
serialize_as!(usize_: 42000000usize => "42000000", Text);
11381138

11391139
serde_if_integer128! {
11401140
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
@@ -1256,13 +1256,13 @@ pub(super) mod tests {
12561256
text!(i16_: -4200i16 => "-4200");
12571257
text!(i32_: -42000000i32 => "-42000000");
12581258
text!(i64_: -42000000000000i64 => "-42000000000000");
1259-
text!(isize_: -42000000000000isize => "-42000000000000");
1259+
text!(isize_: -42000000isize => "-42000000");
12601260

12611261
text!(u8_: 42u8 => "42");
12621262
text!(u16_: 4200u16 => "4200");
12631263
text!(u32_: 42000000u32 => "42000000");
12641264
text!(u64_: 42000000000000u64 => "42000000000000");
1265-
text!(usize_: 42000000000000usize => "42000000000000");
1265+
text!(usize_: 42000000usize => "42000000");
12661266

12671267
serde_if_integer128! {
12681268
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1381,13 +1381,13 @@ pub(super) mod tests {
13811381
value!(i16_: -4200i16 => "-4200");
13821382
value!(i32_: -42000000i32 => "-42000000");
13831383
value!(i64_: -42000000000000i64 => "-42000000000000");
1384-
value!(isize_: -42000000000000isize => "-42000000000000");
1384+
value!(isize_: -42000000isize => "-42000000");
13851385

13861386
value!(u8_: 42u8 => "42");
13871387
value!(u16_: 4200u16 => "4200");
13881388
value!(u32_: 42000000u32 => "42000000");
13891389
value!(u64_: 42000000000000u64 => "42000000000000");
1390-
value!(usize_: 42000000000000usize => "42000000000000");
1390+
value!(usize_: 42000000usize => "42000000");
13911391

13921392
serde_if_integer128! {
13931393
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");

‎src/se/element.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -692,13 +692,13 @@ mod tests {
692692
serialize_as!(i16_: -4200i16 => "<root>-4200</root>");
693693
serialize_as!(i32_: -42000000i32 => "<root>-42000000</root>");
694694
serialize_as!(i64_: -42000000000000i64 => "<root>-42000000000000</root>");
695-
serialize_as!(isize_: -42000000000000isize => "<root>-42000000000000</root>");
695+
serialize_as!(isize_: -42000000isize => "<root>-42000000</root>");
696696

697697
serialize_as!(u8_: 42u8 => "<root>42</root>");
698698
serialize_as!(u16_: 4200u16 => "<root>4200</root>");
699699
serialize_as!(u32_: 42000000u32 => "<root>42000000</root>");
700700
serialize_as!(u64_: 42000000000000u64 => "<root>42000000000000</root>");
701-
serialize_as!(usize_: 42000000000000usize => "<root>42000000000000</root>");
701+
serialize_as!(usize_: 42000000usize => "<root>42000000</root>");
702702

703703
serde_if_integer128! {
704704
serialize_as!(i128_: -420000000000000000000000000000i128 => "<root>-420000000000000000000000000000</root>");
@@ -794,13 +794,13 @@ mod tests {
794794
text!(i16_: -4200i16 => "-4200");
795795
text!(i32_: -42000000i32 => "-42000000");
796796
text!(i64_: -42000000000000i64 => "-42000000000000");
797-
text!(isize_: -42000000000000isize => "-42000000000000");
797+
text!(isize_: -42000000isize => "-42000000");
798798

799799
text!(u8_: 42u8 => "42");
800800
text!(u16_: 4200u16 => "4200");
801801
text!(u32_: 42000000u32 => "42000000");
802802
text!(u64_: 42000000000000u64 => "42000000000000");
803-
text!(usize_: 42000000000000usize => "42000000000000");
803+
text!(usize_: 42000000usize => "42000000");
804804

805805
serde_if_integer128! {
806806
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -919,13 +919,13 @@ mod tests {
919919
text!(i16_: -4200i16 => "-4200");
920920
text!(i32_: -42000000i32 => "-42000000");
921921
text!(i64_: -42000000000000i64 => "-42000000000000");
922-
text!(isize_: -42000000000000isize => "-42000000000000");
922+
text!(isize_: -42000000isize => "-42000000");
923923

924924
text!(u8_: 42u8 => "42");
925925
text!(u16_: 4200u16 => "4200");
926926
text!(u32_: 42000000u32 => "42000000");
927927
text!(u64_: 42000000000000u64 => "42000000000000");
928-
text!(usize_: 42000000000000usize => "42000000000000");
928+
text!(usize_: 42000000usize => "42000000");
929929

930930
serde_if_integer128! {
931931
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1048,13 +1048,13 @@ mod tests {
10481048
value!(i16_: -4200i16 => "-4200");
10491049
value!(i32_: -42000000i32 => "-42000000");
10501050
value!(i64_: -42000000000000i64 => "-42000000000000");
1051-
value!(isize_: -42000000000000isize => "-42000000000000");
1051+
value!(isize_: -42000000isize => "-42000000");
10521052

10531053
value!(u8_: 42u8 => "42");
10541054
value!(u16_: 4200u16 => "4200");
10551055
value!(u32_: 42000000u32 => "42000000");
10561056
value!(u64_: 42000000000000u64 => "42000000000000");
1057-
value!(usize_: 42000000000000usize => "42000000000000");
1057+
value!(usize_: 42000000usize => "42000000");
10581058

10591059
serde_if_integer128! {
10601060
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1159,13 +1159,13 @@ mod tests {
11591159
value!(i16_: -4200i16 => "-4200");
11601160
value!(i32_: -42000000i32 => "-42000000");
11611161
value!(i64_: -42000000000000i64 => "-42000000000000");
1162-
value!(isize_: -42000000000000isize => "-42000000000000");
1162+
value!(isize_: -42000000isize => "-42000000");
11631163

11641164
value!(u8_: 42u8 => "42");
11651165
value!(u16_: 4200u16 => "4200");
11661166
value!(u32_: 42000000u32 => "42000000");
11671167
value!(u64_: 42000000000000u64 => "42000000000000");
1168-
value!(usize_: 42000000000000usize => "42000000000000");
1168+
value!(usize_: 42000000usize => "42000000");
11691169

11701170
serde_if_integer128! {
11711171
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1415,13 +1415,13 @@ mod tests {
14151415
serialize_as!(i16_: -4200i16 => "<root>-4200</root>");
14161416
serialize_as!(i32_: -42000000i32 => "<root>-42000000</root>");
14171417
serialize_as!(i64_: -42000000000000i64 => "<root>-42000000000000</root>");
1418-
serialize_as!(isize_: -42000000000000isize => "<root>-42000000000000</root>");
1418+
serialize_as!(isize_: -42000000isize => "<root>-42000000</root>");
14191419

14201420
serialize_as!(u8_: 42u8 => "<root>42</root>");
14211421
serialize_as!(u16_: 4200u16 => "<root>4200</root>");
14221422
serialize_as!(u32_: 42000000u32 => "<root>42000000</root>");
14231423
serialize_as!(u64_: 42000000000000u64 => "<root>42000000000000</root>");
1424-
serialize_as!(usize_: 42000000000000usize => "<root>42000000000000</root>");
1424+
serialize_as!(usize_: 42000000usize => "<root>42000000</root>");
14251425

14261426
serde_if_integer128! {
14271427
serialize_as!(i128_: -420000000000000000000000000000i128 => "<root>-420000000000000000000000000000</root>");
@@ -1520,13 +1520,13 @@ mod tests {
15201520
text!(i16_: -4200i16 => "-4200");
15211521
text!(i32_: -42000000i32 => "-42000000");
15221522
text!(i64_: -42000000000000i64 => "-42000000000000");
1523-
text!(isize_: -42000000000000isize => "-42000000000000");
1523+
text!(isize_: -42000000isize => "-42000000");
15241524

15251525
text!(u8_: 42u8 => "42");
15261526
text!(u16_: 4200u16 => "4200");
15271527
text!(u32_: 42000000u32 => "42000000");
15281528
text!(u64_: 42000000000000u64 => "42000000000000");
1529-
text!(usize_: 42000000000000usize => "42000000000000");
1529+
text!(usize_: 42000000usize => "42000000");
15301530

15311531
serde_if_integer128! {
15321532
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1646,13 +1646,13 @@ mod tests {
16461646
text!(i16_: -4200i16 => "-4200");
16471647
text!(i32_: -42000000i32 => "-42000000");
16481648
text!(i64_: -42000000000000i64 => "-42000000000000");
1649-
text!(isize_: -42000000000000isize => "-42000000000000");
1649+
text!(isize_: -42000000isize => "-42000000");
16501650

16511651
text!(u8_: 42u8 => "42");
16521652
text!(u16_: 4200u16 => "4200");
16531653
text!(u32_: 42000000u32 => "42000000");
16541654
text!(u64_: 42000000000000u64 => "42000000000000");
1655-
text!(usize_: 42000000000000usize => "42000000000000");
1655+
text!(usize_: 42000000usize => "42000000");
16561656

16571657
serde_if_integer128! {
16581658
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1777,13 +1777,13 @@ mod tests {
17771777
value!(i16_: -4200i16 => "-4200");
17781778
value!(i32_: -42000000i32 => "-42000000");
17791779
value!(i64_: -42000000000000i64 => "-42000000000000");
1780-
value!(isize_: -42000000000000isize => "-42000000000000");
1780+
value!(isize_: -42000000isize => "-42000000");
17811781

17821782
value!(u8_: 42u8 => "42");
17831783
value!(u16_: 4200u16 => "4200");
17841784
value!(u32_: 42000000u32 => "42000000");
17851785
value!(u64_: 42000000000000u64 => "42000000000000");
1786-
value!(usize_: 42000000000000usize => "42000000000000");
1786+
value!(usize_: 42000000usize => "42000000");
17871787

17881788
serde_if_integer128! {
17891789
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1891,13 +1891,13 @@ mod tests {
18911891
value!(i16_: -4200i16 => "-4200");
18921892
value!(i32_: -42000000i32 => "-42000000");
18931893
value!(i64_: -42000000000000i64 => "-42000000000000");
1894-
value!(isize_: -42000000000000isize => "-42000000000000");
1894+
value!(isize_: -42000000isize => "-42000000");
18951895

18961896
value!(u8_: 42u8 => "42");
18971897
value!(u16_: 4200u16 => "4200");
18981898
value!(u32_: 42000000u32 => "42000000");
18991899
value!(u64_: 42000000000000u64 => "42000000000000");
1900-
value!(usize_: 42000000000000usize => "42000000000000");
1900+
value!(usize_: 42000000usize => "42000000");
19011901

19021902
serde_if_integer128! {
19031903
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");

‎src/se/key.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ mod tests {
234234
serialize_as!(i16_: -4200i16 => "-4200");
235235
serialize_as!(i32_: -42000000i32 => "-42000000");
236236
serialize_as!(i64_: -42000000000000i64 => "-42000000000000");
237-
serialize_as!(isize_: -42000000000000isize => "-42000000000000");
237+
serialize_as!(isize_: -42000000isize => "-42000000");
238238

239239
serialize_as!(u8_: 42u8 => "42");
240240
serialize_as!(u16_: 4200u16 => "4200");
241241
serialize_as!(u32_: 42000000u32 => "42000000");
242242
serialize_as!(u64_: 42000000000000u64 => "42000000000000");
243-
serialize_as!(usize_: 42000000000000usize => "42000000000000");
243+
serialize_as!(usize_: 42000000usize => "42000000");
244244

245245
serde_if_integer128! {
246246
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");

‎src/se/simple_type.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,13 +1087,13 @@ mod tests {
10871087
serialize_as!(i16_: -4200i16 => "-4200");
10881088
serialize_as!(i32_: -42000000i32 => "-42000000");
10891089
serialize_as!(i64_: -42000000000000i64 => "-42000000000000");
1090-
serialize_as!(isize_: -42000000000000isize => "-42000000000000");
1090+
serialize_as!(isize_: -42000000isize => "-42000000");
10911091

10921092
serialize_as!(u8_: 42u8 => "42");
10931093
serialize_as!(u16_: 4200u16 => "4200");
10941094
serialize_as!(u32_: 42000000u32 => "42000000");
10951095
serialize_as!(u64_: 42000000000000u64 => "42000000000000");
1096-
serialize_as!(usize_: 42000000000000usize => "42000000000000");
1096+
serialize_as!(usize_: 42000000usize => "42000000");
10971097

10981098
serde_if_integer128! {
10991099
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
@@ -1203,13 +1203,13 @@ mod tests {
12031203
serialize_as!(i16_: -4200i16 => "-4200");
12041204
serialize_as!(i32_: -42000000i32 => "-42000000");
12051205
serialize_as!(i64_: -42000000000000i64 => "-42000000000000");
1206-
serialize_as!(isize_: -42000000000000isize => "-42000000000000");
1206+
serialize_as!(isize_: -42000000isize => "-42000000");
12071207

12081208
serialize_as!(u8_: 42u8 => "42");
12091209
serialize_as!(u16_: 4200u16 => "4200");
12101210
serialize_as!(u32_: 42000000u32 => "42000000");
12111211
serialize_as!(u64_: 42000000000000u64 => "42000000000000");
1212-
serialize_as!(usize_: 42000000000000usize => "42000000000000");
1212+
serialize_as!(usize_: 42000000usize => "42000000");
12131213

12141214
serde_if_integer128! {
12151215
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");

0 commit comments

Comments
 (0)