Skip to content

Commit 2d5bf8a

Browse files
committed
misc: Clippy
1 parent 70b5d3e commit 2d5bf8a

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

lofty/src/ebml/element_reader.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ where
746746
}
747747
}
748748

749-
impl<'a, R> Read for ElementChildIterator<'a, R>
749+
impl<R> Read for ElementChildIterator<'_, R>
750750
where
751751
R: Read,
752752
{
@@ -755,7 +755,7 @@ where
755755
}
756756
}
757757

758-
impl<'a, R> Deref for ElementChildIterator<'a, R>
758+
impl<R> Deref for ElementChildIterator<'_, R>
759759
where
760760
R: Read,
761761
{
@@ -766,7 +766,7 @@ where
766766
}
767767
}
768768

769-
impl<'a, R> DerefMut for ElementChildIterator<'a, R>
769+
impl<R> DerefMut for ElementChildIterator<'_, R>
770770
where
771771
R: Read,
772772
{
@@ -775,7 +775,7 @@ where
775775
}
776776
}
777777

778-
impl<'a, R> Drop for ElementChildIterator<'a, R>
778+
impl<R> Drop for ElementChildIterator<'_, R>
779779
where
780780
R: Read,
781781
{

lofty/src/ebml/read/segment_cluster.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::ebml::element_reader::{
33
ChildElementDescriptor, ElementChildIterator, ElementIdent, ElementReaderYield,
44
};
55
use crate::ebml::properties::EbmlProperties;
6-
use crate::ebml::{AudioTrackDescriptor, VInt};
6+
use crate::ebml::VInt;
77
use crate::error::Result;
88

99
use std::io::{Read, Seek};
@@ -69,7 +69,7 @@ where
6969
continue;
7070
}
7171

72-
total_audio_data_size += (size.value() - header_size as u64);
72+
total_audio_data_size += (size.value() - u64::from(header_size));
7373
},
7474
ElementIdent::BlockGroup => read_block_group(
7575
&mut children_reader.children(),
@@ -87,15 +87,15 @@ where
8787
return Ok(());
8888
}
8989

90-
let duration_millis = properties.duration().as_secs() as u128;
90+
let duration_millis = u128::from(properties.duration().as_secs());
9191
if duration_millis == 0 {
9292
log::warn!("Duration is zero, cannot calculate bitrate");
9393
return Ok(());
9494
}
9595

9696
let default_audio_track = &mut properties.audio_tracks[default_audio_track_position]; // TODO
9797

98-
let bitrate_bps = (((total_audio_data_size as u128) * 8) / duration_millis) as u32;
98+
let bitrate_bps = ((u128::from(total_audio_data_size) * 8) / duration_millis) as u32;
9999
default_audio_track.settings.bitrate = Some(bitrate_bps / 1000);
100100

101101
Ok(())
@@ -144,7 +144,7 @@ where
144144
continue;
145145
}
146146

147-
*total_audio_data_size += (size.value() - header_size as u64);
147+
*total_audio_data_size += (size.value() - u64::from(header_size));
148148
}
149149

150150
Ok(())
@@ -166,7 +166,7 @@ where
166166
let track_number = VInt::<u64>::parse(children_reader, max_size_length)?;
167167
let track_number_octets = track_number.octet_length();
168168

169-
children_reader.skip(block_size - track_number_octets as u64)?;
169+
children_reader.skip(block_size - u64::from(track_number_octets))?;
170170
if track_number != target_track_number {
171171
return Ok((false, track_number_octets + NON_VARIABLE_BLOCK_HEADER_SIZE));
172172
}

lofty/src/properties/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ fn MKA_PROPERTIES() -> EbmlProperties {
8585
},
8686
extensions: Vec::new(),
8787
segment_info: SegmentInfo {
88-
timestamp_scale: 1000000,
88+
timestamp_scale: 1_000_000,
8989
muxing_app: String::from("Lavf60.3.100"),
9090
writing_app: String::from("Lavf60.3.100"),
9191
duration: Some(Duration::from_millis(1431)),
9292
},
9393
audio_tracks: vec![AudioTrackDescriptor {
9494
number: 1,
95-
uid: 18181673715630629642,
95+
uid: 18_181_673_715_630_629_642,
9696
enabled: true,
9797
default: false,
9898
language: Language::Iso639_2(String::from("und")),

0 commit comments

Comments
 (0)