xmpp-parsers: Fix size tests on 64-bit

Emmanuel Gil Peyrot created 2 years ago

Change summary

parsers/src/bind.rs         | 2 +-
parsers/src/bookmarks.rs    | 2 +-
parsers/src/carbons.rs      | 4 ++--
parsers/src/delay.rs        | 2 +-
parsers/src/disco.rs        | 5 +----
parsers/src/forwarding.rs   | 2 +-
parsers/src/iq.rs           | 4 ++--
parsers/src/jid_prep.rs     | 5 +----
parsers/src/jingle.rs       | 2 +-
parsers/src/jingle_s5b.rs   | 5 +----
parsers/src/mam.rs          | 2 +-
parsers/src/message.rs      | 2 +-
parsers/src/presence.rs     | 2 +-
parsers/src/roster.rs       | 2 +-
parsers/src/stanza_error.rs | 2 +-
parsers/src/stanza_id.rs    | 5 +----
parsers/src/stream.rs       | 2 +-
parsers/src/websocket.rs    | 2 +-
18 files changed, 20 insertions(+), 32 deletions(-)

Detailed changes

parsers/src/bind.rs

@@ -150,7 +150,7 @@ mod tests {
     #[test]
     fn test_size() {
         assert_size!(BindQuery, 24);
-        assert_size!(BindResponse, 72);
+        assert_size!(BindResponse, 32);
     }
 
     #[test]

parsers/src/bookmarks.rs

@@ -84,7 +84,7 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        assert_size!(Conference, 128);
+        assert_size!(Conference, 112);
         assert_size!(Url, 48);
         assert_size!(Storage, 48);
     }

parsers/src/carbons.rs

@@ -82,8 +82,8 @@ mod tests {
         assert_size!(Enable, 0);
         assert_size!(Disable, 0);
         assert_size!(Private, 0);
-        assert_size!(Received, 408);
-        assert_size!(Sent, 408);
+        assert_size!(Received, 288);
+        assert_size!(Sent, 288);
     }
 
     #[test]

parsers/src/delay.rs

@@ -47,7 +47,7 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        assert_size!(Delay, 120);
+        assert_size!(Delay, 80);
     }
 
     #[test]

parsers/src/disco.rs

@@ -254,10 +254,7 @@ mod tests {
         assert_size!(DiscoInfoQuery, 24);
         assert_size!(DiscoInfoResult, 96);
 
-        #[cfg(rustc_nightly)]
-        assert_size!(Item, 120);
-        #[cfg(not(rustc_nightly))]
-        assert_size!(Item, 128);
+        assert_size!(Item, 88);
         assert_size!(DiscoItemsQuery, 24);
         assert_size!(DiscoItemsResult, 48);
     }

parsers/src/forwarding.rs

@@ -39,7 +39,7 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        assert_size!(Forwarded, 408);
+        assert_size!(Forwarded, 288);
     }
 
     #[test]

parsers/src/iq.rs

@@ -240,8 +240,8 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        assert_size!(IqType, 232);
-        assert_size!(Iq, 416);
+        assert_size!(IqType, 192);
+        assert_size!(Iq, 296);
     }
 
     #[test]

parsers/src/jid_prep.rs

@@ -55,10 +55,7 @@ mod tests {
     #[test]
     fn test_size() {
         assert_size!(JidPrepQuery, 24);
-        #[cfg(rustc_nightly)]
-        assert_size!(JidPrepResponse, 72);
-        #[cfg(not(rustc_nightly))]
-        assert_size!(JidPrepResponse, 80);
+        assert_size!(JidPrepResponse, 40);
     }
 
     #[test]

parsers/src/jingle.rs

@@ -712,7 +712,7 @@ mod tests {
         assert_size!(Reason, 1);
         assert_size!(ReasonElement, 32);
         assert_size!(SessionId, 24);
-        assert_size!(Jingle, 304);
+        assert_size!(Jingle, 224);
     }
 
     #[test]

parsers/src/jingle_s5b.rs

@@ -297,10 +297,7 @@ mod tests {
         assert_size!(Mode, 1);
         assert_size!(CandidateId, 24);
         assert_size!(StreamId, 24);
-        #[cfg(rustc_nightly)]
-        assert_size!(Candidate, 128);
-        #[cfg(not(rustc_nightly))]
-        assert_size!(Candidate, 136);
+        assert_size!(Candidate, 96);
         assert_size!(TransportPayload, 32);
         assert_size!(Transport, 88);
     }

parsers/src/mam.rs

@@ -109,7 +109,7 @@ mod tests {
     fn test_size() {
         assert_size!(QueryId, 24);
         assert_size!(Query, 232);
-        assert_size!(Result_, 456);
+        assert_size!(Result_, 336);
         assert_size!(Complete, 1);
         assert_size!(Fin, 88);
     }

parsers/src/message.rs

@@ -318,7 +318,7 @@ mod tests {
         assert_size!(Body, 24);
         assert_size!(Subject, 24);
         assert_size!(Thread, 24);
-        assert_size!(Message, 288);
+        assert_size!(Message, 208);
     }
 
     #[test]

parsers/src/presence.rs

@@ -393,7 +393,7 @@ mod tests {
     fn test_size() {
         assert_size!(Show, 1);
         assert_size!(Type, 1);
-        assert_size!(Presence, 240);
+        assert_size!(Presence, 160);
     }
 
     #[test]

parsers/src/roster.rs

@@ -112,7 +112,7 @@ mod tests {
         assert_size!(Group, 24);
         assert_size!(Subscription, 1);
         assert_size!(Ask, 1);
-        assert_size!(Item, 104);
+        assert_size!(Item, 88);
         assert_size!(Roster, 48);
     }
 

parsers/src/stanza_error.rs

@@ -326,7 +326,7 @@ mod tests {
     fn test_size() {
         assert_size!(ErrorType, 1);
         assert_size!(DefinedCondition, 1);
-        assert_size!(StanzaError, 232);
+        assert_size!(StanzaError, 192);
     }
 
     #[test]

parsers/src/stanza_id.rs

@@ -52,10 +52,7 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        #[cfg(rustc_nightly)]
-        assert_size!(StanzaId, 96);
-        #[cfg(not(rustc_nightly))]
-        assert_size!(StanzaId, 104);
+        assert_size!(StanzaId, 64);
         assert_size!(OriginId, 24);
     }
 

parsers/src/stream.rs

@@ -85,7 +85,7 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        assert_size!(Stream, 168);
+        assert_size!(Stream, 136);
     }
 
     #[test]

parsers/src/websocket.rs

@@ -84,7 +84,7 @@ mod tests {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_size() {
-        assert_size!(Open, 168);
+        assert_size!(Open, 136);
     }
 
     #[test]