chore: fix

Author: ovr

rust/cubenativeutils/Cargo.lock

@@ -1 +1,2 @@
-imports_granularity = "Crate"
+# TODO: Uncomment, when it will become stable in rustfmt - https://github.com/rust-lang/rustfmt/issues/4991
+# imports_granularity = "Crate"

rust/cubenativeutils/rustfmt.toml

@@ -59,7 +59,7 @@ impl<'cx, C: Context<'cx> + NoenContextLifetimeExpand<'cx> + 'cx> NeonContextGua
     fn new(cx: C) -> Self {
         Self {
             context: ContextWrapper::new(cx.expand_lifetime()),
-            lifetime: PhantomData::default(),
+            lifetime: PhantomData,
         }
     }
 
@@ -111,9 +111,9 @@ impl<C: Context<'static>> ContextHolder<C> {
             let res = cx.with_context(f);
             Ok(res)
         } else {
-            Err(CubeError::internal(format!(
-                "Call to neon context outside of its lifetime"
-            )))
+            Err(CubeError::internal(
+                "Call to neon context outside of its lifetime".to_string(),
+            ))
         }
     }
 }

rust/cubenativeutils/src/wrappers/neon/context.rs

@@ -85,7 +85,7 @@ impl<C: Context<'static>, T: 'static> NeonBox<C, T> {
     pub fn new(object: NeonTypeHandle<C, JsBox<T>>) -> Self {
         Self {
             object,
-            _marker: PhantomData::default(),
+            _marker: PhantomData,
         }
     }
 }

rust/cubenativeutils/src/wrappers/neon/object/base_types.rs

@@ -29,7 +29,7 @@ impl<C: Context<'static> + 'static, V: Value + 'static> NeonTypeHandle<C, V> {
     }
 
     pub fn get_object(&self) -> Handle<'static, V> {
-        self.object.clone()
+        self.object
     }
 
     pub fn get_object_ref(&self) -> &Handle<'static, V> {
@@ -73,7 +73,7 @@ impl<C: Context<'static>, V: Value + 'static> Clone for NeonTypeHandle<C, V> {
     fn clone(&self) -> Self {
         Self {
             context: self.context.clone(),
-            object: self.object.clone(),
+            object: self.object,
         }
     }
 }
@@ -89,7 +89,7 @@ impl<C: Context<'static> + 'static> NeonObject<C> {
     }
 
     pub fn get_object(&self) -> Handle<'static, JsValue> {
-        self.object.clone()
+        self.object
     }
 
     pub fn get_object_ref(&self) -> &Handle<'static, JsValue> {
@@ -169,7 +169,7 @@ impl<C: Context<'static>> Clone for NeonObject<C> {
     fn clone(&self) -> Self {
         Self {
             context: self.context.clone(),
-            object: self.object.clone(),
+            object: self.object,
         }
     }
 }

rust/cubenativeutils/src/wrappers/neon/object/mod.rs

@@ -39,7 +39,7 @@ impl<C: Context<'static> + 'static> NativeFunction<NeonInnerTypes<C>> for NeonFu
             let null = cx.null();
             neon_object
                 .call(cx, null, neon_args)
-                .map_err(|_| CubeError::internal(format!("Failed to call function ")))
+                .map_err(|_| CubeError::internal("Failed to call function ".to_string()))
         })??;
         Ok(NativeObjectHandle::new(NeonObject::new(
             self.object.context.clone(),
@@ -54,7 +54,7 @@ impl<C: Context<'static> + 'static> NativeFunction<NeonInnerTypes<C>> for NeonFu
                     let res = neon_object
                         .to_string(cx)
                         .map_err(|_| {
-                            CubeError::internal(format!("Can't convert function to string"))
+                            CubeError::internal("Can't convert function to string".to_string())
                         })?
                         .value(cx);
                     Ok(res)

rust/cubenativeutils/src/wrappers/neon/object/neon_function.rs

@@ -74,13 +74,13 @@ impl<C: Context<'static> + 'static> NativeStruct<NeonInnerTypes<C>> for NeonStru
         &self,
     ) -> Result<Vec<NativeObjectHandle<NeonInnerTypes<C>>>, CubeError> {
         let neon_array = self.object.map_neon_object(|cx, neon_object| {
-            let neon_array = neon_object
-                .get_own_property_names(cx)
-                .map_err(|_| CubeError::internal(format!("Cannot get own properties not found")))?;
+            let neon_array = neon_object.get_own_property_names(cx).map_err(|_| {
+                CubeError::internal("Cannot get own properties not found".to_string())
+            })?;
 
             neon_array
                 .to_vec(cx)
-                .map_err(|_| CubeError::internal(format!("Failed to convert array")))
+                .map_err(|_| CubeError::internal("Failed to convert array".to_string()))
         })??;
         Ok(neon_array
             .into_iter()
@@ -102,7 +102,7 @@ impl<C: Context<'static> + 'static> NativeStruct<NeonInnerTypes<C>> for NeonStru
                 .get::<JsFunction, _, _>(cx, method)
                 .map_err(|_| CubeError::internal(format!("Method `{}` not found", method)))?;
             neon_method
-                .call(cx, neon_object.clone(), neon_args)
+                .call(cx, *neon_object, neon_args)
                 .map_err(|err| {
                     CubeError::internal(format!(
                         "Failed to call method `{} {} {:?}",

rust/cubenativeutils/src/wrappers/neon/object/neon_struct.rs

@@ -123,7 +123,7 @@ impl<'de, IT: InnerTypes> Deserializer<'de> for NativeSerdeDeserializer<IT> {
         V: Visitor<'de>,
     {
         if let Ok(val) = self.input.to_number() {
-            visitor.visit_f64(val.value().unwrap() as f64)
+            visitor.visit_f64(val.value().unwrap())
         } else {
             Err(NativeObjSerializerError::Message(
                 "JS Number expected for f64 field".to_string(),
@@ -178,7 +178,7 @@ struct NativeMapDeserializer<IT: InnerTypes> {
 impl<IT: InnerTypes> NativeMapDeserializer<IT> {
     pub fn new(input: IT::Struct) -> Result<Self, NativeObjSerializerError> {
         let prop_names = input.get_own_property_names().map_err(|_| {
-            NativeObjSerializerError::Message(format!("Failed to get property names"))
+            NativeObjSerializerError::Message("Failed to get property names".to_string())
         })?;
         let len = prop_names.len() as u32;
         Ok(Self {
@@ -214,23 +214,23 @@ impl<'de, IT: InnerTypes> MapAccess<'de> for NativeMapDeserializer<IT> {
         V: DeserializeSeed<'de>,
     {
         if self.value_idx >= self.len {
-            return Err(NativeObjSerializerError::Message(format!(
-                "Array index out of bounds"
-            )));
+            return Err(NativeObjSerializerError::Message(
+                "Array index out of bounds".to_string(),
+            ));
         }
         let prop_name = self
             .prop_names
             .get(self.value_idx as usize)
             .ok_or_else(|| {
-                NativeObjSerializerError::Message(format!("Array index out of bounds"))
+                NativeObjSerializerError::Message("Array index out of bounds".to_string())
             })?;
         let prop_string = prop_name
             .to_string()
             .and_then(|s| s.value())
-            .map_err(|_| NativeObjSerializerError::Message(format!("key should be string")))?;
+            .map_err(|_| NativeObjSerializerError::Message("key should be string".to_string()))?;
 
         let value = self.input.get_field(&prop_string).map_err(|_| {
-            NativeObjSerializerError::Message(format!("Failed to get property name"))
+            NativeObjSerializerError::Message("Failed to get property name".to_string())
         })?;
 
         self.value_idx += 1;

rust/cubenativeutils/src/wrappers/serializer/deserializer.rs

@@ -115,7 +115,7 @@ impl<IT: InnerTypes> ser::Serializer for NativeSerdeSerializer<IT> {
 
     fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error> {
         Ok(NativeObjectHandle::new(
-            self.context.number(v as f64)?.into_object(),
+            self.context.number(v)?.into_object(),
         ))
     }