Skip to content

Commit 912c343

Browse files
committed
Fixed clippy warnings and GitHib CI for MSRV v1.73
1 parent 406bb6d commit 912c343

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
matrix:
1111
rust:
1212
- stable
13-
- 1.65.0
13+
- 1.73.0
1414
steps:
1515
- uses: actions/checkout@v2
1616
- uses: actions-rs/toolchain@v1
@@ -35,7 +35,7 @@ jobs:
3535
# matrix:
3636
# rust:
3737
# - stable
38-
# - 1.65.0
38+
# - 1.73.0
3939
# steps:
4040
# - uses: actions/checkout@v2
4141
# - uses: actions-rs/toolchain@v1
@@ -74,7 +74,7 @@ jobs:
7474
matrix:
7575
rust:
7676
- stable
77-
- 1.65.0
77+
- 1.73.0
7878
steps:
7979
- uses: actions/checkout@v2
8080
- uses: actions-rs/toolchain@v1

src/buffer.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
use std::{
5252
collections::HashMap,
5353
marker::PhantomData,
54-
mem,
54+
mem::size_of,
5555
os::raw::{c_int, c_longlong},
5656
};
5757

@@ -356,14 +356,14 @@ pub struct Iter<'a, T: 'a> {
356356
step: isize,
357357
}
358358

359-
impl<'a, T> Iter<'a, T> {
359+
impl<T> Iter<'_, T> {
360360
/// Create an iterator to move channel data out of a buffer.
361361
pub fn new(buf: &Buffer, chan: &Channel) -> Self {
362362
unsafe {
363363
let begin = ffi::iio_buffer_first(buf.buf, chan.chan).cast();
364364
let end = ffi::iio_buffer_end(buf.buf).cast();
365365
let ptr = begin;
366-
let step: isize = ffi::iio_buffer_step(buf.buf) / mem::size_of::<T>() as isize;
366+
let step: isize = ffi::iio_buffer_step(buf.buf) / size_of::<T>() as isize;
367367

368368
Self {
369369
_phantom: PhantomData,
@@ -412,7 +412,7 @@ impl<'a, T: 'a> IterMut<'a, T> {
412412
let begin = ffi::iio_buffer_first(buf.buf, chan.chan).cast();
413413
let end = ffi::iio_buffer_end(buf.buf).cast();
414414
let ptr = begin;
415-
let step: isize = ffi::iio_buffer_step(buf.buf) / mem::size_of::<T>() as isize;
415+
let step: isize = ffi::iio_buffer_step(buf.buf) / size_of::<T>() as isize;
416416

417417
Self {
418418
_phantom: PhantomData,
@@ -451,7 +451,7 @@ pub struct AttrIterator<'a> {
451451
idx: usize,
452452
}
453453

454-
impl<'a> Iterator for AttrIterator<'a> {
454+
impl Iterator for AttrIterator<'_> {
455455
type Item = String;
456456

457457
/// Gets the next Buffer attribute from the iterator

src/channel.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::{
1616
any::TypeId,
1717
collections::HashMap,
1818
ffi::CString,
19-
mem,
19+
mem::{self, size_of, size_of_val},
2020
os::raw::{c_char, c_int, c_longlong, c_uint, c_void},
2121
};
2222

@@ -493,7 +493,7 @@ impl Channel {
493493
}
494494

495495
let n = buf.capacity();
496-
let sz_item = mem::size_of::<T>();
496+
let sz_item = size_of::<T>();
497497
let sz_in = n * sz_item;
498498

499499
let mut v = vec![T::default(); n];
@@ -519,7 +519,7 @@ impl Channel {
519519
}
520520

521521
let n = buf.capacity();
522-
let sz_item = mem::size_of::<T>();
522+
let sz_item = size_of::<T>();
523523
let sz_in = n * sz_item;
524524

525525
let mut v = vec![T::default(); n];
@@ -546,8 +546,8 @@ impl Channel {
546546
return Err(Error::WrongDataType);
547547
}
548548

549-
let sz_item = mem::size_of::<T>();
550-
let sz_in = mem::size_of_val(data);
549+
let sz_item = size_of::<T>();
550+
let sz_in = size_of_val(data);
551551

552552
let sz = unsafe { ffi::iio_channel_write(self.chan, buf.buf, data.as_ptr().cast(), sz_in) };
553553

@@ -564,8 +564,8 @@ impl Channel {
564564
return Err(Error::WrongDataType);
565565
}
566566

567-
let sz_item = mem::size_of::<T>();
568-
let sz_in = mem::size_of_val(data);
567+
let sz_item = size_of::<T>();
568+
let sz_in = size_of_val(data);
569569

570570
let sz = unsafe { ffi::iio_channel_write(self.chan, buf.buf, data.as_ptr().cast(), sz_in) };
571571

@@ -590,7 +590,7 @@ pub struct AttrIterator<'a> {
590590
idx: usize,
591591
}
592592

593-
impl<'a> Iterator for AttrIterator<'a> {
593+
impl Iterator for AttrIterator<'_> {
594594
type Item = String;
595595

596596
/// Gets the next Channel attribute from the iterator

src/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ pub struct DeviceIterator<'a> {
465465
idx: usize,
466466
}
467467

468-
impl<'a> Iterator for DeviceIterator<'a> {
468+
impl Iterator for DeviceIterator<'_> {
469469
type Item = Device;
470470

471471
/// Gets the next Device from the iterator.
@@ -489,7 +489,7 @@ pub struct AttrIterator<'a> {
489489
idx: usize,
490490
}
491491

492-
impl<'a> Iterator for AttrIterator<'a> {
492+
impl Iterator for AttrIterator<'_> {
493493
type Item = (String, String);
494494

495495
/// Gets the next Device attribute from the iterator.

src/device.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ pub struct ChannelIterator<'a> {
360360
idx: usize,
361361
}
362362

363-
impl<'a> Iterator for ChannelIterator<'a> {
363+
impl Iterator for ChannelIterator<'_> {
364364
type Item = Channel;
365365

366366
fn next(&mut self) -> Option<Self::Item> {
@@ -383,7 +383,7 @@ pub struct AttrIterator<'a> {
383383
idx: usize,
384384
}
385385

386-
impl<'a> Iterator for AttrIterator<'a> {
386+
impl Iterator for AttrIterator<'_> {
387387
type Item = String;
388388

389389
/// Gets the next Device attribute from the iterator

src/scan_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub struct ScanContextIterator<'a> {
8383
idx: u32,
8484
}
8585

86-
impl<'a> Iterator for ScanContextIterator<'a> {
86+
impl Iterator for ScanContextIterator<'_> {
8787
type Item = (String, String);
8888

8989
fn next(&mut self) -> Option<Self::Item> {

0 commit comments

Comments
 (0)