Skip to content

Commit ec20edb

Browse files
committed
chore: Fix clippy and etc
1 parent 3f709ab commit ec20edb

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

crates/macros/src/interface.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@ struct InterfaceData<'a> {
4949
}
5050

5151
impl ToTokens for InterfaceData<'_> {
52+
#[allow(clippy::too_many_lines)]
5253
fn to_tokens(&self, tokens: &mut TokenStream) {
5354
let interface_name = format_ident!("PhpInterface{}", self.ident);
5455
let name = &self.name;
5556
let implements = &self.attrs.extends;
5657
let methods_sig = &self.methods;
5758
let constants = &self.constants;
5859

59-
let _constructor = self.constructor
60+
let _constructor = self
61+
.constructor
6062
.as_ref()
6163
.map(|func| func.constructor_meta(&self.path))
6264
.option_tokens();

src/builders/class.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ impl ClassBuilder {
5858
}
5959
}
6060

61+
/// Return PHP class flags
62+
#[must_use]
6163
pub fn get_flags(&self) -> u32 {
6264
self.ce.ce_flags
6365
}

src/describe/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::builders::EnumBuilder;
77
use crate::{
88
builders::{ClassBuilder, FunctionBuilder},
99
constant::IntoConst,
10-
flags::{ClassFlags, DataType, MethodFlags, PropertyFlags},
10+
flags::{DataType, MethodFlags, PropertyFlags},
1111
prelude::ModuleBuilder,
1212
};
1313
use abi::{Option, RString, Str, Vec};
@@ -274,7 +274,7 @@ impl From<ClassBuilder> for Class {
274274
.map(Constant::from)
275275
.collect::<StdVec<_>>()
276276
.into(),
277-
flags: flags,
277+
flags,
278278
}
279279
}
280280
}

src/describe/stub.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl ToStub for Class {
226226
self.docs.fmt_stub(buf)?;
227227

228228
let (_, name) = split_namespace(self.name.as_ref());
229-
let flags = ClassFlags::from_bits(self.flags).unwrap();
229+
let flags = ClassFlags::from_bits(self.flags).unwrap_or(ClassFlags::empty());
230230
let is_interface = flags.contains(ClassFlags::Interface);
231231

232232
if is_interface {
@@ -379,10 +379,10 @@ impl ToStub for Method {
379379
}
380380
}
381381

382-
if !self.r#abstract {
383-
writeln!(buf, " {{}}")
384-
} else {
382+
if self.r#abstract {
385383
writeln!(buf, ";")
384+
} else {
385+
writeln!(buf, " {{}}")
386386
}
387387
}
388388
}

tests/src/integration/interface/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use ext_php_rs::zend::ce;
66
#[php_interface]
77
#[php(extends(ce = ce::throwable, stub = "\\Throwable"))]
88
#[php(name = "ExtPhpRs\\Interface\\EmptyObjectInterface")]
9+
#[allow(dead_code)]
910
pub trait EmptyObjectTrait {
1011
const STRING_CONST: &'static str = "STRING_CONST";
1112

0 commit comments

Comments
 (0)