fix zero copy derive test

Author: ananas-block

program-libs/zero-copy-derive/tests/ui/pass/02_single_u8_field.rs

@@ -15,23 +15,20 @@ fn main() {
     let ref_struct = SingleU8 { value: 42 };
     let bytes = ref_struct.try_to_vec().unwrap();
 
-    let (struct_copy, _remaining) = SingleU8::zero_copy_at(&bytes).unwrap();
+    let (struct_copy, remaining) = SingleU8::zero_copy_at(&bytes).unwrap();
     assert_eq!(struct_copy, ref_struct);
-    assert!(_remaining.is_empty());
+    assert!(remaining.is_empty());
 
     let mut bytes_mut = bytes.clone();
-    let (_struct_copy_mut, _remaining) = SingleU8::zero_copy_at_mut(&mut bytes_mut).unwrap();
-    assert!(_remaining.is_empty());
+    let (_struct_copy_mut, remaining) = SingleU8::zero_copy_at_mut(&mut bytes_mut).unwrap();
+    assert!(remaining.is_empty());
     // assert byte len
     let config = ();
     let byte_len = SingleU8::byte_len(&config).unwrap();
     assert_eq!(bytes.len(), byte_len);
     let mut new_bytes = vec![0u8; byte_len];
-<<<<<<< HEAD
-    let (mut struct_copy_mut, remaining) = SingleU8::new_zero_copy(&mut new_bytes, config).unwrap();
-=======
-    let (mut struct_copy_mut, _remaining) = SingleU8::new_zero_copy(&mut new_bytes, config).unwrap();
->>>>>>> fc4574cfa (feat: ctoken pinocchio)
+    let (mut struct_copy_mut, _remaining) =
+        SingleU8::new_zero_copy(&mut new_bytes, config).unwrap();
     // convert primitive to zero copy type
     struct_copy_mut.value = 42.into();
     assert_eq!(new_bytes, bytes);