From 6df80628670565a64c215a17ed832afb3e2b050a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 27 Feb 2024 12:27:31 +0100 Subject: [PATCH] Fix size tests on latest Rust release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Rust 1.76, and some much older nightly, there have been improvements to the niche computation, which leads to smaller types which can encode the same amount of data, variants, and such. This fixes the tests on this compiler version. --- parsers/src/avatar.rs | 4 ++-- parsers/src/bob.rs | 8 ++++---- parsers/src/caps.rs | 4 ++-- parsers/src/hashes.rs | 8 ++++---- parsers/src/jingle.rs | 2 +- parsers/src/jingle_dtls_srtp.rs | 4 ++-- parsers/src/jingle_ice_udp.rs | 4 ++-- parsers/src/jingle_message.rs | 4 ++-- parsers/src/xhtml.rs | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/parsers/src/avatar.rs b/parsers/src/avatar.rs index 8aef7c873ed1710355dd964a9f862169c01e489f..65ef22f7f6ad6bb3bf43c173ffa7c955a3f7f51a 100644 --- a/parsers/src/avatar.rs +++ b/parsers/src/avatar.rs @@ -66,7 +66,7 @@ mod tests { #[test] fn test_size() { assert_size!(Metadata, 12); - assert_size!(Info, 64); + assert_size!(Info, 60); assert_size!(Data, 12); } @@ -74,7 +74,7 @@ mod tests { #[test] fn test_size() { assert_size!(Metadata, 24); - assert_size!(Info, 120); + assert_size!(Info, 112); assert_size!(Data, 24); } diff --git a/parsers/src/bob.rs b/parsers/src/bob.rs index 79c4de5bf9e6b54e0f681293b24d10f4d1c8b63f..9639bf50bbf28407158c75a1068025946c8d7d08 100644 --- a/parsers/src/bob.rs +++ b/parsers/src/bob.rs @@ -93,15 +93,15 @@ mod tests { #[cfg(target_pointer_width = "32")] #[test] fn test_size() { - assert_size!(ContentId, 28); - assert_size!(Data, 60); + assert_size!(ContentId, 24); + assert_size!(Data, 56); } #[cfg(target_pointer_width = "64")] #[test] fn test_size() { - assert_size!(ContentId, 56); - assert_size!(Data, 120); + assert_size!(ContentId, 48); + assert_size!(Data, 112); } #[test] diff --git a/parsers/src/caps.rs b/parsers/src/caps.rs index d3990b4ec619e749328acb23e6738b4de3043b49..2d1e3c7c279e6f2f9aa0b8b2277d6c109e0cf6ee 100644 --- a/parsers/src/caps.rs +++ b/parsers/src/caps.rs @@ -222,13 +222,13 @@ mod tests { #[cfg(target_pointer_width = "32")] #[test] fn test_size() { - assert_size!(Caps, 52); + assert_size!(Caps, 48); } #[cfg(target_pointer_width = "64")] #[test] fn test_size() { - assert_size!(Caps, 104); + assert_size!(Caps, 96); } #[test] diff --git a/parsers/src/hashes.rs b/parsers/src/hashes.rs index b899b4a057be4f4367627de239065810e0ea14f4..c79a71dd887ea6a82d01a548fb9226a6deb268b1 100644 --- a/parsers/src/hashes.rs +++ b/parsers/src/hashes.rs @@ -209,15 +209,15 @@ mod tests { #[cfg(target_pointer_width = "32")] #[test] fn test_size() { - assert_size!(Algo, 16); - assert_size!(Hash, 28); + assert_size!(Algo, 12); + assert_size!(Hash, 24); } #[cfg(target_pointer_width = "64")] #[test] fn test_size() { - assert_size!(Algo, 32); - assert_size!(Hash, 56); + assert_size!(Algo, 24); + assert_size!(Hash, 48); } #[test] diff --git a/parsers/src/jingle.rs b/parsers/src/jingle.rs index bddc3c52166680883ca26a681c5b0bf3daec893f..f8e8fdc43c366934f89d2f394ea3ecd77c3f3471 100644 --- a/parsers/src/jingle.rs +++ b/parsers/src/jingle.rs @@ -688,7 +688,7 @@ mod tests { assert_size!(Senders, 1); assert_size!(Disposition, 1); assert_size!(ContentId, 12); - assert_size!(Content, 220); + assert_size!(Content, 216); assert_size!(Reason, 1); assert_size!(ReasonElement, 16); assert_size!(SessionId, 12); diff --git a/parsers/src/jingle_dtls_srtp.rs b/parsers/src/jingle_dtls_srtp.rs index dcf192476b360e0b17f393b6a13c530290ecaa61..1101b4eb28f8c92cf36d3065fe751b1f53006d81 100644 --- a/parsers/src/jingle_dtls_srtp.rs +++ b/parsers/src/jingle_dtls_srtp.rs @@ -78,14 +78,14 @@ mod tests { #[test] fn test_size() { assert_size!(Setup, 1); - assert_size!(Fingerprint, 32); + assert_size!(Fingerprint, 28); } #[cfg(target_pointer_width = "64")] #[test] fn test_size() { assert_size!(Setup, 1); - assert_size!(Fingerprint, 64); + assert_size!(Fingerprint, 56); } #[test] diff --git a/parsers/src/jingle_ice_udp.rs b/parsers/src/jingle_ice_udp.rs index f464288b96379fe4c115f8292f7005a3528864f6..683107f182a8cbc5bfdeec7796a2b4d131241a2f 100644 --- a/parsers/src/jingle_ice_udp.rs +++ b/parsers/src/jingle_ice_udp.rs @@ -118,7 +118,7 @@ mod tests { #[cfg(target_pointer_width = "32")] #[test] fn test_size() { - assert_size!(Transport, 68); + assert_size!(Transport, 64); assert_size!(Type, 1); assert_size!(Candidate, 88); } @@ -126,7 +126,7 @@ mod tests { #[cfg(target_pointer_width = "64")] #[test] fn test_size() { - assert_size!(Transport, 136); + assert_size!(Transport, 128); assert_size!(Type, 1); assert_size!(Candidate, 128); } diff --git a/parsers/src/jingle_message.rs b/parsers/src/jingle_message.rs index c32da472e8ce904714d963ac0be3d267bc78c23a..2206773b797d8c729a266b54f93d81f8e31dbf2a 100644 --- a/parsers/src/jingle_message.rs +++ b/parsers/src/jingle_message.rs @@ -109,13 +109,13 @@ mod tests { #[cfg(target_pointer_width = "32")] #[test] fn test_size() { - assert_size!(JingleMI, 76); + assert_size!(JingleMI, 72); } #[cfg(target_pointer_width = "64")] #[test] fn test_size() { - assert_size!(JingleMI, 152); + assert_size!(JingleMI, 144); } #[test] diff --git a/parsers/src/xhtml.rs b/parsers/src/xhtml.rs index dcd259f6aff98a81d165c1577000e2364a21080d..f89b4e2df20642444ad9dcdc7c8656132dbac29c 100644 --- a/parsers/src/xhtml.rs +++ b/parsers/src/xhtml.rs @@ -504,16 +504,16 @@ mod tests { #[test] fn test_size() { assert_size!(XhtmlIm, 32); - assert_size!(Child, 52); - assert_size!(Tag, 52); + assert_size!(Child, 48); + assert_size!(Tag, 48); } #[cfg(target_pointer_width = "64")] #[test] fn test_size() { assert_size!(XhtmlIm, 48); - assert_size!(Child, 104); - assert_size!(Tag, 104); + assert_size!(Child, 96); + assert_size!(Tag, 96); } #[test]