diff --git a/crates/macros/src/parsing.rs b/crates/macros/src/parsing.rs index e249b51c9..849654a8f 100644 --- a/crates/macros/src/parsing.rs +++ b/crates/macros/src/parsing.rs @@ -61,7 +61,7 @@ pub struct PhpRename { impl PhpRename { pub fn rename(&self, name: impl AsRef, 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)) } @@ -69,7 +69,7 @@ impl PhpRename { pub fn rename_method(&self, name: impl AsRef, 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)) diff --git a/src/enum_.rs b/src/enum_.rs index 0e139f2fa..5868a876d 100644 --- a/src/enum_.rs +++ b/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"); }); } } diff --git a/src/flags.rs b/src/flags.rs index fb0c3717e..db124e5ec 100644 --- a/src/flags.rs +++ b/src/flags.rs @@ -355,7 +355,7 @@ impl From 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] diff --git a/tests/module.rs b/tests/module.rs index 95c2935aa..9154966cc 100644 --- a/tests/module.rs +++ b/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!"); }); } diff --git a/tests/sapi.rs b/tests/sapi.rs index e6477c4dc..11c67d7f5 100644 --- a/tests/sapi.rs +++ b/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);"); diff --git a/tests/src/integration/class/mod.rs b/tests/src/integration/class/mod.rs index fe1aae7ae..3c3a2bb0c 100644 --- a/tests/src/integration/class/mod.rs +++ b/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)]