Merge pull request #577 from extphprs/fix/clippy-rust-1-91

Author: ptondereau

crates/macros/src/parsing.rs

@@ -61,15 +61,15 @@ pub struct PhpRename {
 impl PhpRename {
     pub fn rename(&self, name: impl AsRef<str>, default: RenameRule) -> String {
         if let Some(name) = self.name.as_ref() {
-            name.to_string()
+            name.clone()
         } else {
             name.as_ref().rename(self.change_case.unwrap_or(default))
         }
     }
 
     pub fn rename_method(&self, name: impl AsRef<str>, default: RenameRule) -> String {
         if let Some(name) = self.name.as_ref() {
-            name.to_string()
+            name.clone()
         } else {
             name.as_ref()
                 .rename_method(self.change_case.unwrap_or(default))

src/enum_.rs

@@ -161,7 +161,7 @@ mod tests {
 
             let zval_str: Zval = Zval::try_from(&Discriminant::String("foo")).unwrap();
             assert!(zval_str.is_string());
-            assert_eq!(zval_str.string().unwrap().to_string(), "foo");
+            assert_eq!(zval_str.string().unwrap().clone(), "foo");
         });
     }
 }

src/flags.rs

@@ -355,7 +355,7 @@ impl From<u8> for FunctionType {
 
 /// Valid data types for PHP.
 #[repr(C, u8)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub enum DataType {
     /// Undefined
     Undef,
@@ -386,6 +386,7 @@ pub enum DataType {
     /// Constant expression
     ConstantExpression,
     /// Void
+    #[default]
     Void,
     /// Mixed
     Mixed,
@@ -397,12 +398,6 @@ pub enum DataType {
     Indirect,
 }
 
-impl Default for DataType {
-    fn default() -> Self {
-        Self::Void
-    }
-}
-
 impl DataType {
     /// Returns the integer representation of the data type.
     #[must_use]

tests/module.rs

@@ -37,7 +37,7 @@ fn test_module() {
 
         let string = zval.string().unwrap();
 
-        assert_eq!(string.to_string(), "Hello, foo!");
+        assert_eq!(string.clone(), "Hello, foo!");
     });
 }
 

tests/sapi.rs

@@ -68,7 +68,7 @@ fn test_sapi() {
 
         let string = zval.string().unwrap();
 
-        assert_eq!(string.to_string(), "Hello, foo!");
+        assert_eq!(string.clone(), "Hello, foo!");
 
         let result = Embed::eval("var_dump($foo);");
 

tests/src/integration/class/mod.rs

@@ -20,7 +20,7 @@ pub struct TestClass {
 impl TestClass {
     #[php(getter)]
     pub fn get_string(&self) -> String {
-        self.string.to_string()
+        self.string.clone()
     }
 
     #[php(setter)]