Skip to content

Commit a5d790a

Browse files
authored
Merge pull request #67 from AndersTrier/AndersTrier/clippy_1.90.0
Clippy lints
2 parents e143f20 + 58be0d4 commit a5d790a

File tree

11 files changed

+17
-16
lines changed

11 files changed

+17
-16
lines changed

clippy.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc-valid-idents = ["AArch64", "CRC32c", "HighwayHash", ".."]

src/decoder_result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl DecoderResult<'_> {
2424

2525
/// Returns iterator over all restored original shards
2626
/// and their indexes, ordered by indexes.
27-
pub fn restored_original_iter(&self) -> RestoredOriginal {
27+
pub fn restored_original_iter(&self) -> RestoredOriginal<'_> {
2828
RestoredOriginal::new(self.work)
2929
}
3030
}

src/encoder_result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl EncoderResult<'_> {
2828
///
2929
/// Recovery shards have indexes `0..recovery_count`
3030
/// and these same indexes must be used when decoding.
31-
pub fn recovery_iter(&self) -> Recovery {
31+
pub fn recovery_iter(&self) -> Recovery<'_> {
3232
Recovery::new(self.work)
3333
}
3434
}

src/engine/shards.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) struct Shards {
1515
}
1616

1717
impl Shards {
18-
pub(crate) fn as_ref_mut(&mut self) -> ShardsRefMut {
18+
pub(crate) fn as_ref_mut(&mut self) -> ShardsRefMut<'_> {
1919
ShardsRefMut::new(self.shard_count, self.shard_len_64, self.data.as_mut())
2020
}
2121

@@ -190,7 +190,7 @@ impl<'a> ShardsRefMut<'a> {
190190

191191
/// Splits this [`ShardsRefMut`] into two so that
192192
/// first includes shards `0..mid` and second includes shards `mid..`.
193-
pub fn split_at_mut(&mut self, mid: usize) -> (ShardsRefMut, ShardsRefMut) {
193+
pub fn split_at_mut(&mut self, mid: usize) -> (ShardsRefMut<'_>, ShardsRefMut<'_>) {
194194
let (a, b) = self.data.split_at_mut(mid * self.shard_len_64);
195195

196196
(

src/rate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ where
124124
fn add_original_shard<T: AsRef<[u8]>>(&mut self, original_shard: T) -> Result<(), Error>;
125125

126126
/// Like [`ReedSolomonEncoder::encode`](crate::ReedSolomonEncoder::encode).
127-
fn encode(&mut self) -> Result<EncoderResult, Error>;
127+
fn encode(&mut self) -> Result<EncoderResult<'_>, Error>;
128128

129129
/// Consumes this encoder returning its [`Engine`] and [`EncoderWork`]
130130
/// so that they can be re-used by another encoder.
@@ -201,7 +201,7 @@ where
201201
) -> Result<(), Error>;
202202

203203
/// Like [`ReedSolomonDecoder::decode`](crate::ReedSolomonDecoder::decode).
204-
fn decode(&mut self) -> Result<DecoderResult, Error>;
204+
fn decode(&mut self) -> Result<DecoderResult<'_>, Error>;
205205

206206
/// Consumes this decoder returning its [`Engine`] and [`DecoderWork`]
207207
/// so that they can be re-used by another decoder.

src/rate/decoder_work.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl DecoderWork {
121121
// - Returned `FixedBitSet` may contain extra zero bits.
122122
pub(crate) fn decode_begin(
123123
&mut self,
124-
) -> Result<Option<(ShardsRefMut, usize, usize, &FixedBitSet)>, Error> {
124+
) -> Result<Option<(ShardsRefMut<'_>, usize, usize, &FixedBitSet)>, Error> {
125125
if self.original_received_count + self.recovery_received_count < self.original_count {
126126
Err(Error::NotEnoughShards {
127127
original_count: self.original_count,

src/rate/encoder_work.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl EncoderWork {
7171
}
7272
}
7373

74-
pub(crate) fn encode_begin(&mut self) -> Result<(ShardsRefMut, usize, usize), Error> {
74+
pub(crate) fn encode_begin(&mut self) -> Result<(ShardsRefMut<'_>, usize, usize), Error> {
7575
if self.original_received_count == self.original_count {
7676
Ok((
7777
self.shards.as_ref_mut(),

src/rate/rate_default.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl<E: Engine> RateEncoder<E> for DefaultRateEncoder<E> {
114114
}
115115
}
116116

117-
fn encode(&mut self) -> Result<EncoderResult, Error> {
117+
fn encode(&mut self) -> Result<EncoderResult<'_>, Error> {
118118
match &mut self.0 {
119119
InnerEncoder::High(high) => high.encode(),
120120
InnerEncoder::Low(low) => low.encode(),
@@ -258,7 +258,7 @@ impl<E: Engine> RateDecoder<E> for DefaultRateDecoder<E> {
258258
}
259259
}
260260

261-
fn decode(&mut self) -> Result<DecoderResult, Error> {
261+
fn decode(&mut self) -> Result<DecoderResult<'_>, Error> {
262262
match &mut self.0 {
263263
InnerDecoder::High(high) => high.decode(),
264264
InnerDecoder::Low(low) => low.decode(),

src/rate/rate_high.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<E: Engine> RateEncoder<E> for HighRateEncoder<E> {
4141
self.work.add_original_shard(original_shard)
4242
}
4343

44-
fn encode(&mut self) -> Result<EncoderResult, Error> {
44+
fn encode(&mut self) -> Result<EncoderResult<'_>, Error> {
4545
let (mut work, original_count, recovery_count) = self.work.encode_begin()?;
4646
let chunk_size = recovery_count.next_power_of_two();
4747
let engine = &self.engine;
@@ -169,7 +169,7 @@ impl<E: Engine> RateDecoder<E> for HighRateDecoder<E> {
169169
self.work.add_recovery_shard(index, recovery_shard)
170170
}
171171

172-
fn decode(&mut self) -> Result<DecoderResult, Error> {
172+
fn decode(&mut self) -> Result<DecoderResult<'_>, Error> {
173173
let Some((mut work, original_count, recovery_count, received)) =
174174
self.work.decode_begin()?
175175
else {

src/rate/rate_low.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<E: Engine> RateEncoder<E> for LowRateEncoder<E> {
4141
self.work.add_original_shard(original_shard)
4242
}
4343

44-
fn encode(&mut self) -> Result<EncoderResult, Error> {
44+
fn encode(&mut self) -> Result<EncoderResult<'_>, Error> {
4545
let (mut work, original_count, recovery_count) = self.work.encode_begin()?;
4646
let chunk_size = original_count.next_power_of_two();
4747
let engine = &self.engine;
@@ -169,7 +169,7 @@ impl<E: Engine> RateDecoder<E> for LowRateDecoder<E> {
169169
self.work.add_recovery_shard(index, recovery_shard)
170170
}
171171

172-
fn decode(&mut self) -> Result<DecoderResult, Error> {
172+
fn decode(&mut self) -> Result<DecoderResult<'_>, Error> {
173173
let Some((mut work, original_count, recovery_count, received)) =
174174
self.work.decode_begin()?
175175
else {

0 commit comments

Comments
 (0)