deserialize: Rename types in MaybeEmpty<T>

Author: Lorak-mmk

scylla-cql/src/deserialize/value.rs

@@ -120,6 +120,7 @@ where
     #[inline]
     fn type_check(typ: &ColumnType) -> Result<(), TypeCheckError> {
         <T as DeserializeValue<'frame, 'metadata>>::type_check(typ)
+            .map_err(typck_error_replace_rust_name::<Self>)
     }
 
     fn deserialize(
@@ -130,7 +131,8 @@ where
         if val.is_empty() {
             Ok(MaybeEmpty::Empty)
         } else {
-            let v = <T as DeserializeValue<'frame, 'metadata>>::deserialize(typ, v)?;
+            let v = <T as DeserializeValue<'frame, 'metadata>>::deserialize(typ, v)
+                .map_err(deser_error_replace_rust_name::<Self>)?;
             Ok(MaybeEmpty::Value(v))
         }
     }

scylla-cql/src/deserialize/value_tests.rs

@@ -1871,6 +1871,32 @@ fn test_option_errors() {
     );
 }
 
+#[test]
+fn test_maybe_empty_errors() {
+    // Type check correctly renames Rust type
+    assert_type_check_error!(
+        &Bytes::new(),
+        MaybeEmpty<i32>,
+        ColumnType::Native(NativeType::Text),
+        BuiltinTypeCheckErrorKind::MismatchedType {
+            expected: &[ColumnType::Native(NativeType::Int)]
+        }
+    );
+
+    // Deserialize correctly renames Rust type
+    let v = 123_i32;
+    let bytes = serialize(&ColumnType::Native(NativeType::Int), &v);
+    assert_deser_error!(
+        &bytes,
+        MaybeEmpty<f64>,
+        ColumnType::Native(NativeType::Double),
+        BuiltinDeserializationErrorKind::ByteLengthMismatch {
+            expected: 8,
+            got: 4,
+        }
+    );
+}
+
 #[test]
 fn test_set_or_list_errors() {
     // Not a set or list