Skip to content

Commit 59721e4

Browse files
authored
Merge pull request #344 from davidcole1340/fix-clippy
refactor(clippy): fix new clippy errors
2 parents e06fbaa + 66afff0 commit 59721e4

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

src/types/array.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -678,13 +678,13 @@ impl<'a> Iterator for Iter<'a> {
678678
}
679679
}
680680

681-
impl<'a> ExactSizeIterator for Iter<'a> {
681+
impl ExactSizeIterator for Iter<'_> {
682682
fn len(&self) -> usize {
683683
self.ht.len()
684684
}
685685
}
686686

687-
impl<'a> DoubleEndedIterator for Iter<'a> {
687+
impl DoubleEndedIterator for Iter<'_> {
688688
fn next_back(&mut self) -> Option<Self::Item> {
689689
let key_type = unsafe {
690690
zend_hash_get_current_key_type_ex(
@@ -730,8 +730,8 @@ impl<'a> DoubleEndedIterator for Iter<'a> {
730730
}
731731
}
732732

733-
impl<'a, 'b> Iter<'a> {
734-
pub fn next_zval(&'b mut self) -> Option<(Zval, &'a Zval)> {
733+
impl<'a> Iter<'a> {
734+
pub fn next_zval(&mut self) -> Option<(Zval, &'a Zval)> {
735735
let key_type = unsafe {
736736
zend_hash_get_current_key_type_ex(
737737
self.ht as *const ZendHashTable as *mut ZendHashTable,
@@ -805,13 +805,13 @@ impl<'a> Iterator for Values<'a> {
805805
}
806806
}
807807

808-
impl<'a> ExactSizeIterator for Values<'a> {
808+
impl ExactSizeIterator for Values<'_> {
809809
fn len(&self) -> usize {
810810
self.0.len()
811811
}
812812
}
813813

814-
impl<'a> DoubleEndedIterator for Values<'a> {
814+
impl DoubleEndedIterator for Values<'_> {
815815
fn next_back(&mut self) -> Option<Self::Item> {
816816
self.0.next_back().map(|(_, zval)| zval)
817817
}
@@ -847,7 +847,7 @@ impl<'a> FromZval<'a> for &'a ZendHashTable {
847847
}
848848

849849
///////////////////////////////////////////
850-
/// HashMap
850+
// HashMap
851851
///////////////////////////////////////////
852852

853853
impl<'a, V> TryFrom<&'a ZendHashTable> for HashMap<String, V>
@@ -916,7 +916,7 @@ where
916916
}
917917

918918
///////////////////////////////////////////
919-
/// Vec
919+
// Vec
920920
///////////////////////////////////////////
921921

922922
impl<'a, T> TryFrom<&'a ZendHashTable> for Vec<T>

src/types/callable.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl<'a> FromZval<'a> for ZendCallable<'a> {
142142
}
143143
}
144144

145-
impl<'a> TryFrom<Zval> for ZendCallable<'a> {
145+
impl TryFrom<Zval> for ZendCallable<'_> {
146146
type Error = Error;
147147

148148
fn try_from(value: Zval) -> Result<Self> {
@@ -158,7 +158,7 @@ enum OwnedZval<'a> {
158158
Owned(Zval),
159159
}
160160

161-
impl<'a> OwnedZval<'a> {
161+
impl OwnedZval<'_> {
162162
fn as_ref(&self) -> &Zval {
163163
match self {
164164
OwnedZval::Reference(zv) => zv,
@@ -167,7 +167,7 @@ impl<'a> OwnedZval<'a> {
167167
}
168168
}
169169

170-
impl<'a> Deref for OwnedZval<'a> {
170+
impl Deref for OwnedZval<'_> {
171171
type Target = Zval;
172172

173173
fn deref(&self) -> &Self::Target {

src/types/iterable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub enum Iterable<'a> {
1212
Traversable(&'a mut ZendIterator),
1313
}
1414

15-
impl<'a> Iterable<'a> {
15+
impl Iterable<'_> {
1616
/// Creates a new rust iterator from a PHP iterable.
1717
/// May return None if a Traversable cannot be rewound.
1818
pub fn iter(&mut self) -> Option<Iter> {

src/types/object.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ impl IntoZval for ZBox<ZendObject> {
365365
}
366366
}
367367

368-
impl<'a> IntoZval for &'a mut ZendObject {
368+
impl IntoZval for &mut ZendObject {
369369
const TYPE: DataType = DataType::Object(None);
370370

371371
#[inline]

src/types/zval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Zval {
5353

5454
/// Dereference the zval, if it is a reference.
5555
pub fn dereference(&self) -> &Self {
56-
return self.reference().or_else(|| self.indirect()).unwrap_or(self);
56+
self.reference().or_else(|| self.indirect()).unwrap_or(self)
5757
}
5858

5959
/// Dereference the zval mutable, if it is a reference.

0 commit comments

Comments
 (0)