Serialize data in consistent order across implementations

juergbi · Jun 29, 2020 · 7f3e65a · 7f3e65a
1 parent 67789d4
commit 7f3e65a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/benches/marshal_bench.rs b/benches/marshal_bench.rs
@@ -59,8 +59,8 @@ fn make_dbus_native_message(parts: &MessageParts, send_it: bool) {
         body.append(&parts.int1).unwrap();
         body.append(&stru).unwrap();
         body.append(&dict).unwrap();
-        body.append(&stringarr).unwrap();
         body.append(&intarr).unwrap();
+        body.append(&stringarr).unwrap();
     }
 
     let path = dbus_native::strings::ObjectPath::new(&parts.object).unwrap();
@@ -134,12 +134,12 @@ fn make_rustbus_message<'a, 'e>(parts: &'a MessageParts, send_it: bool) {
             .push_param((parts.int2, parts.string2.as_str()))
             .unwrap();
         msg.body.push_param(&parts.dict).unwrap();
-        msg.body.push_param(parts.string_array.as_slice()).unwrap();
         msg.body
             .push_param(rustbus::wire::marshal_trait::OptimizedMarshal(
                 parts.int_array.as_slice(),
             ))
             .unwrap();
+        msg.body.push_param(parts.string_array.as_slice()).unwrap();
     }
 
     msg.serial = Some(1);

diff --git a/src/lib.rs b/src/lib.rs
@@ -79,8 +79,8 @@ mod tests {
                 Container::Struct(vec![parts.string2.as_str().into(), parts.int2.into()]).into(),
             );
             params.push(dict.clone());
-            params.push(stringarray.clone());
             params.push(intarray.clone());
+            params.push(stringarray.clone());
         }
 
         let mut msg = rustbus::message_builder::MessageBuilder::new()