Skip to content

Commit b242ce7

Browse files
Fix new beta clippy warnings
1 parent fc2917d commit b242ce7

30 files changed

+125
-127
lines changed

cairo/src/device.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::{Content, RecordingSurface, ScriptMode, Surface};
1919
#[must_use = "if unused the Device will immediately be released"]
2020
pub struct DeviceAcquireGuard<'a>(&'a Device);
2121

22-
impl<'a> Drop for DeviceAcquireGuard<'a> {
22+
impl Drop for DeviceAcquireGuard<'_> {
2323
#[inline]
2424
fn drop(&mut self) {
2525
self.0.release();

cairo/src/image_surface.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ pub struct ImageSurfaceData<'a> {
234234
dirty: bool,
235235
}
236236

237-
unsafe impl<'a> Send for ImageSurfaceData<'a> {}
238-
unsafe impl<'a> Sync for ImageSurfaceData<'a> {}
237+
unsafe impl Send for ImageSurfaceData<'_> {}
238+
unsafe impl Sync for ImageSurfaceData<'_> {}
239239

240240
impl<'a> ImageSurfaceData<'a> {
241241
fn new(surface: &'a mut ImageSurface) -> ImageSurfaceData<'a> {
@@ -255,7 +255,7 @@ impl<'a> ImageSurfaceData<'a> {
255255
}
256256
}
257257

258-
impl<'a> Drop for ImageSurfaceData<'a> {
258+
impl Drop for ImageSurfaceData<'_> {
259259
#[inline]
260260
fn drop(&mut self) {
261261
if self.dirty {
@@ -264,7 +264,7 @@ impl<'a> Drop for ImageSurfaceData<'a> {
264264
}
265265
}
266266

267-
impl<'a> Deref for ImageSurfaceData<'a> {
267+
impl Deref for ImageSurfaceData<'_> {
268268
type Target = [u8];
269269

270270
#[inline]
@@ -273,7 +273,7 @@ impl<'a> Deref for ImageSurfaceData<'a> {
273273
}
274274
}
275275

276-
impl<'a> DerefMut for ImageSurfaceData<'a> {
276+
impl DerefMut for ImageSurfaceData<'_> {
277277
#[inline]
278278
fn deref_mut(&mut self) -> &mut [u8] {
279279
self.dirty = true;

cairo/src/paths.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub struct PathSegments<'a> {
6565
num_data: usize,
6666
}
6767

68-
impl<'a> Iterator for PathSegments<'a> {
68+
impl Iterator for PathSegments<'_> {
6969
type Item = PathSegment;
7070

7171
fn next(&mut self) -> Option<PathSegment> {
@@ -93,7 +93,7 @@ impl<'a> Iterator for PathSegments<'a> {
9393
}
9494
}
9595

96-
impl<'a> FusedIterator for PathSegments<'a> {}
96+
impl FusedIterator for PathSegments<'_> {}
9797

9898
fn to_tuple(pair: &[f64; 2]) -> (f64, f64) {
9999
(pair[0], pair[1])

gio/src/dbus_connection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub struct RegistrationBuilder<'a> {
3838
Option<Box_<dyn Fn(DBusConnection, &str, &str, &str, &str, glib::Variant) -> bool>>,
3939
}
4040

41-
impl<'a> RegistrationBuilder<'a> {
41+
impl RegistrationBuilder<'_> {
4242
pub fn method_call<
4343
F: Fn(DBusConnection, &str, &str, &str, &str, glib::Variant, DBusMethodInvocation) + 'static,
4444
>(

gio/src/inet_address.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub enum InetAddressBytes<'a> {
1212
V6(&'a [u8; 16]),
1313
}
1414

15-
impl<'a> InetAddressBytes<'a> {
15+
impl InetAddressBytes<'_> {
1616
#[inline]
1717
fn deref(&self) -> &[u8] {
1818
use self::InetAddressBytes::*;

gio/src/list_model.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub trait ListModelExtManual: IsA<ListModel> + Sized {
2626
/// # Panics
2727
///
2828
/// Panics if `T::static_type().is_a(self.item_type())` is not true.
29-
3029
fn iter<LT: IsA<glib::Object>>(&self) -> ListModelIter<LT> {
3130
assert!(self.item_type().is_a(LT::static_type()));
3231

@@ -80,7 +79,7 @@ pub struct ListModelIter<'a, T: IsA<glib::Object>> {
8079
changed: Rc<Cell<bool>>,
8180
signal_id: Option<SignalHandlerId>,
8281
}
83-
impl<'a, T: IsA<glib::Object>> Iterator for ListModelIter<'a, T> {
82+
impl<T: IsA<glib::Object>> Iterator for ListModelIter<'_, T> {
8483
type Item = Result<T, ListModelMutatedDuringIter>;
8584

8685
fn next(&mut self) -> Option<Self::Item> {
@@ -139,11 +138,11 @@ impl<'a, T: IsA<glib::Object>> Iterator for ListModelIter<'a, T> {
139138
}
140139
}
141140

142-
impl<'a, T: IsA<glib::Object>> FusedIterator for ListModelIter<'a, T> {}
141+
impl<T: IsA<glib::Object>> FusedIterator for ListModelIter<'_, T> {}
143142

144-
impl<'a, T: IsA<glib::Object>> ExactSizeIterator for ListModelIter<'a, T> {}
143+
impl<T: IsA<glib::Object>> ExactSizeIterator for ListModelIter<'_, T> {}
145144

146-
impl<'a, T: IsA<glib::Object>> DoubleEndedIterator for ListModelIter<'a, T> {
145+
impl<T: IsA<glib::Object>> DoubleEndedIterator for ListModelIter<'_, T> {
147146
fn next_back(&mut self) -> Option<Self::Item> {
148147
if self.reverse_pos == self.i {
149148
return None;
@@ -178,7 +177,7 @@ impl<'a, T: IsA<glib::Object>> DoubleEndedIterator for ListModelIter<'a, T> {
178177
}
179178
}
180179
}
181-
impl<'a, T: IsA<glib::Object>> Drop for ListModelIter<'a, T> {
180+
impl<T: IsA<glib::Object>> Drop for ListModelIter<'_, T> {
182181
#[inline]
183182
fn drop(&mut self) {
184183
self.model.disconnect(self.signal_id.take().unwrap());

gio/src/settings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub struct BindingBuilder<'a> {
1717
set_mapping: Option<Box<dyn Fn(&glib::Value, glib::VariantType) -> Option<glib::Variant>>>,
1818
}
1919

20-
impl<'a> BindingBuilder<'a> {
20+
impl BindingBuilder<'_> {
2121
pub fn flags(mut self, flags: SettingsBindFlags) -> Self {
2222
self.flags = flags;
2323
self

gio/src/socket.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ impl<'v> InputVector<'v> {
8181
}
8282
}
8383

84-
unsafe impl<'v> Send for InputVector<'v> {}
85-
unsafe impl<'v> Sync for InputVector<'v> {}
84+
unsafe impl Send for InputVector<'_> {}
85+
unsafe impl Sync for InputVector<'_> {}
8686

87-
impl<'v> std::ops::Deref for InputVector<'v> {
87+
impl std::ops::Deref for InputVector<'_> {
8888
type Target = [u8];
8989

9090
#[inline]
@@ -93,7 +93,7 @@ impl<'v> std::ops::Deref for InputVector<'v> {
9393
}
9494
}
9595

96-
impl<'v> std::ops::DerefMut for InputVector<'v> {
96+
impl std::ops::DerefMut for InputVector<'_> {
9797
#[inline]
9898
fn deref_mut(&mut self) -> &mut Self::Target {
9999
unsafe { std::slice::from_raw_parts_mut(self.vector.buffer as *mut _, self.vector.size) }
@@ -230,10 +230,10 @@ impl<'v> OutputVector<'v> {
230230
}
231231
}
232232

233-
unsafe impl<'v> Send for OutputVector<'v> {}
234-
unsafe impl<'v> Sync for OutputVector<'v> {}
233+
unsafe impl Send for OutputVector<'_> {}
234+
unsafe impl Sync for OutputVector<'_> {}
235235

236-
impl<'v> std::ops::Deref for OutputVector<'v> {
236+
impl std::ops::Deref for OutputVector<'_> {
237237
type Target = [u8];
238238

239239
#[inline]

gio/src/unix_fd_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ pub trait UnixFDListExtManual: IsA<UnixFDList> + Sized {
5555
}
5656

5757
#[doc(alias = "g_unix_fd_list_peek_fds")]
58-
5958
fn peek_fds(&self) -> Vec<RawFd> {
6059
unsafe {
6160
let mut length = mem::MaybeUninit::uninit();
@@ -66,6 +65,7 @@ pub trait UnixFDListExtManual: IsA<UnixFDList> + Sized {
6665
ret
6766
}
6867
}
68+
6969
#[doc(alias = "g_unix_fd_list_steal_fds")]
7070
fn steal_fds(&self) -> Vec<RawFd> {
7171
unsafe {

gio/src/unix_socket_address.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub enum UnixSocketAddressPath<'a> {
1919
AbstractPadded(&'a [u8]),
2020
}
2121

22-
impl<'a> UnixSocketAddressPath<'a> {
22+
impl UnixSocketAddressPath<'_> {
2323
fn to_type(&self) -> UnixSocketAddressType {
2424
use self::UnixSocketAddressPath::*;
2525

0 commit comments

Comments
 (0)