Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/macros/src/parsing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/enum_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
}
}
9 changes: 2 additions & 7 deletions src/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -386,6 +386,7 @@ pub enum DataType {
/// Constant expression
ConstantExpression,
/// Void
#[default]
Void,
/// Mixed
Mixed,
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tests/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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!");
});
}

Expand Down
2 changes: 1 addition & 1 deletion tests/sapi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);");

Expand Down
2 changes: 1 addition & 1 deletion tests/src/integration/class/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Loading