Skip to content

Commit 49c342e

Browse files
wprzytulawprzytula
authored
Merge pull request #1136 from muzarski/clippy-1.83
rust: appease compiler, formatter and linter from toolchain 1.83
2 parents 64647f9 + 9639b99 commit 49c342e

File tree

29 files changed

+112
-65
lines changed

29 files changed

+112
-65
lines changed

‎examples/cqlsh-rs.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,10 @@ fn print_result(result: QueryResult) -> Result<(), IntoRowsResultError> {
196196
}
197197
Ok(())
198198
}
199-
Err(IntoRowsResultError::ResultNotRows(_)) => Ok(println!("OK")),
199+
Err(IntoRowsResultError::ResultNotRows(_)) => {
200+
println!("OK");
201+
Ok(())
202+
}
200203
Err(e) => Err(e),
201204
}
202205
}

‎scylla-cql/src/frame/request/batch.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@ impl BatchStatement<'_> {
228228
}
229229
}
230230

231+
// Disable the lint, if there is more than one lifetime included.
232+
// Can be removed once https://github.com/rust-lang/rust-clippy/issues/12495 is fixed.
233+
#[allow(clippy::needless_lifetimes)]
231234
impl<'s, 'b> From<&'s BatchStatement<'b>> for BatchStatement<'s> {
232235
fn from(value: &'s BatchStatement) -> Self {
233236
match value {

‎scylla-cql/src/frame/request/execute.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl SerializableRequest for Execute<'_> {
3636
}
3737
}
3838

39-
impl<'e> DeserializableRequest for Execute<'e> {
39+
impl DeserializableRequest for Execute<'_> {
4040
fn deserialize(buf: &mut &[u8]) -> Result<Self, RequestDeserializationError> {
4141
let id = types::read_short_bytes(buf)?.to_vec().into();
4242
let parameters = QueryParameters::deserialize(buf)?;

‎scylla-cql/src/frame/request/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub enum Request<'r> {
140140
Batch(Batch<'r, BatchStatement<'r>, Vec<SerializedValues>>),
141141
}
142142

143-
impl<'r> Request<'r> {
143+
impl Request<'_> {
144144
pub fn deserialize(
145145
buf: &mut &[u8],
146146
opcode: RequestOpcode,

‎scylla-cql/src/frame/request/prepare.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub struct Prepare<'a> {
1313
pub query: &'a str,
1414
}
1515

16-
impl<'a> SerializableRequest for Prepare<'a> {
16+
impl SerializableRequest for Prepare<'_> {
1717
const OPCODE: RequestOpcode = RequestOpcode::Prepare;
1818

1919
fn serialize(&self, buf: &mut Vec<u8>) -> Result<(), CqlRequestSerializationError> {

‎scylla-cql/src/frame/request/query.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl SerializableRequest for Query<'_> {
4949
}
5050
}
5151

52-
impl<'q> DeserializableRequest for Query<'q> {
52+
impl DeserializableRequest for Query<'_> {
5353
fn deserialize(buf: &mut &[u8]) -> Result<Self, RequestDeserializationError> {
5454
let contents = Cow::Owned(types::read_long_string(buf)?.to_owned());
5555
let parameters = QueryParameters::deserialize(buf)?;
@@ -146,7 +146,7 @@ impl QueryParameters<'_> {
146146
}
147147
}
148148

149-
impl<'q> QueryParameters<'q> {
149+
impl QueryParameters<'_> {
150150
pub fn deserialize(buf: &mut &[u8]) -> Result<Self, RequestDeserializationError> {
151151
let consistency = types::read_consistency(buf)?;
152152

‎scylla-cql/src/frame/response/result.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub enum ColumnType<'frame> {
8383
Varint,
8484
}
8585

86-
impl<'frame> ColumnType<'frame> {
86+
impl ColumnType<'_> {
8787
pub fn into_owned(self) -> ColumnType<'static> {
8888
match self {
8989
ColumnType::Custom(cow) => ColumnType::Custom(cow.into_owned().into()),

‎scylla-cql/src/frame/value.rs‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ impl ValueList for LegacySerializedValues {
16091609
}
16101610
}
16111611

1612-
impl<'b> ValueList for Cow<'b, LegacySerializedValues> {
1612+
impl ValueList for Cow<'_, LegacySerializedValues> {
16131613
fn serialized(&self) -> SerializedResult<'_> {
16141614
Ok(Cow::Borrowed(self.as_ref()))
16151615
}
@@ -1662,23 +1662,32 @@ where
16621662
IT: Iterator<Item = &'a VL> + Clone,
16631663
VL: ValueList + 'a,
16641664
{
1665-
type LegacyBatchValuesIter<'r> = LegacyBatchValuesIteratorFromIterator<IT> where Self: 'r;
1665+
type LegacyBatchValuesIter<'r>
1666+
= LegacyBatchValuesIteratorFromIterator<IT>
1667+
where
1668+
Self: 'r;
16661669
fn batch_values_iter(&self) -> Self::LegacyBatchValuesIter<'_> {
16671670
self.it.clone().into()
16681671
}
16691672
}
16701673

16711674
// Implement BatchValues for slices of ValueList types
16721675
impl<T: ValueList> LegacyBatchValues for [T] {
1673-
type LegacyBatchValuesIter<'r> = LegacyBatchValuesIteratorFromIterator<std::slice::Iter<'r, T>> where Self: 'r;
1676+
type LegacyBatchValuesIter<'r>
1677+
= LegacyBatchValuesIteratorFromIterator<std::slice::Iter<'r, T>>
1678+
where
1679+
Self: 'r;
16741680
fn batch_values_iter(&self) -> Self::LegacyBatchValuesIter<'_> {
16751681
self.iter().into()
16761682
}
16771683
}
16781684

16791685
// Implement BatchValues for Vec<ValueList>
16801686
impl<T: ValueList> LegacyBatchValues for Vec<T> {
1681-
type LegacyBatchValuesIter<'r> = LegacyBatchValuesIteratorFromIterator<std::slice::Iter<'r, T>> where Self: 'r;
1687+
type LegacyBatchValuesIter<'r>
1688+
= LegacyBatchValuesIteratorFromIterator<std::slice::Iter<'r, T>>
1689+
where
1690+
Self: 'r;
16821691
fn batch_values_iter(&self) -> Self::LegacyBatchValuesIter<'_> {
16831692
LegacyBatchValues::batch_values_iter(self.as_slice())
16841693
}
@@ -1687,7 +1696,10 @@ impl<T: ValueList> LegacyBatchValues for Vec<T> {
16871696
// Here is an example implementation for (T0, )
16881697
// Further variants are done using a macro
16891698
impl<T0: ValueList> LegacyBatchValues for (T0,) {
1690-
type LegacyBatchValuesIter<'r> = LegacyBatchValuesIteratorFromIterator<std::iter::Once<&'r T0>> where Self: 'r;
1699+
type LegacyBatchValuesIter<'r>
1700+
= LegacyBatchValuesIteratorFromIterator<std::iter::Once<&'r T0>>
1701+
where
1702+
Self: 'r;
16911703
fn batch_values_iter(&self) -> Self::LegacyBatchValuesIter<'_> {
16921704
std::iter::once(&self.0).into()
16931705
}
@@ -1775,8 +1787,11 @@ impl_batch_values_for_tuple!(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T
17751787
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15; 16);
17761788

17771789
// Every &impl BatchValues should also implement BatchValues
1778-
impl<'a, T: LegacyBatchValues + ?Sized> LegacyBatchValues for &'a T {
1779-
type LegacyBatchValuesIter<'r> = <T as LegacyBatchValues>::LegacyBatchValuesIter<'r> where Self: 'r;
1790+
impl<T: LegacyBatchValues + ?Sized> LegacyBatchValues for &T {
1791+
type LegacyBatchValuesIter<'r>
1792+
= <T as LegacyBatchValues>::LegacyBatchValuesIter<'r>
1793+
where
1794+
Self: 'r;
17801795
fn batch_values_iter(&self) -> Self::LegacyBatchValuesIter<'_> {
17811796
<T as LegacyBatchValues>::batch_values_iter(*self)
17821797
}
@@ -1806,8 +1821,10 @@ impl<'f, T: LegacyBatchValues> LegacyBatchValuesFirstSerialized<'f, T> {
18061821
}
18071822

18081823
impl<'f, BV: LegacyBatchValues> LegacyBatchValues for LegacyBatchValuesFirstSerialized<'f, BV> {
1809-
type LegacyBatchValuesIter<'r> =
1810-
LegacyBatchValuesFirstSerialized<'f, <BV as LegacyBatchValues>::LegacyBatchValuesIter<'r>> where Self: 'r;
1824+
type LegacyBatchValuesIter<'r>
1825+
= LegacyBatchValuesFirstSerialized<'f, <BV as LegacyBatchValues>::LegacyBatchValuesIter<'r>>
1826+
where
1827+
Self: 'r;
18111828
fn batch_values_iter(&self) -> Self::LegacyBatchValuesIter<'_> {
18121829
LegacyBatchValuesFirstSerialized {
18131830
first: self.first,

‎scylla-cql/src/types/deserialize/result.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,12 @@ mod tests {
255255
fn lend_next(&mut self) -> Option<Result<Self::Item<'_>, DeserializationError>>;
256256
}
257257

258+
// Disable the lint, if there is more than one lifetime included.
259+
// Can be removed once https://github.com/rust-lang/rust-clippy/issues/12495 is fixed.
260+
#[allow(clippy::needless_lifetimes)]
258261
impl<'frame, 'metadata> LendingIterator for RawRowIterator<'frame, 'metadata> {
259-
type Item<'borrow> = ColumnIterator<'borrow, 'borrow>
262+
type Item<'borrow>
263+
= ColumnIterator<'borrow, 'borrow>
260264
where
261265
Self: 'borrow;
262266

‎scylla-cql/src/types/serialize/batch.rs‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ where
166166
IT: Iterator<Item = &'sr SR> + Clone,
167167
SR: SerializeRow + 'sr,
168168
{
169-
type BatchValuesIter<'r> = BatchValuesIteratorFromIterator<IT> where Self: 'r;
169+
type BatchValuesIter<'r>
170+
= BatchValuesIteratorFromIterator<IT>
171+
where
172+
Self: 'r;
170173

171174
#[inline]
172175
fn batch_values_iter(&self) -> Self::BatchValuesIter<'_> {
@@ -176,7 +179,10 @@ where
176179

177180
// Implement BatchValues for slices of SerializeRow types
178181
impl<T: SerializeRow> BatchValues for [T] {
179-
type BatchValuesIter<'r> = BatchValuesIteratorFromIterator<std::slice::Iter<'r, T>> where Self: 'r;
182+
type BatchValuesIter<'r>
183+
= BatchValuesIteratorFromIterator<std::slice::Iter<'r, T>>
184+
where
185+
Self: 'r;
180186

181187
#[inline]
182188
fn batch_values_iter(&self) -> Self::BatchValuesIter<'_> {
@@ -186,7 +192,10 @@ impl<T: SerializeRow> BatchValues for [T] {
186192

187193
// Implement BatchValues for Vec<SerializeRow>
188194
impl<T: SerializeRow> BatchValues for Vec<T> {
189-
type BatchValuesIter<'r> = BatchValuesIteratorFromIterator<std::slice::Iter<'r, T>> where Self: 'r;
195+
type BatchValuesIter<'r>
196+
= BatchValuesIteratorFromIterator<std::slice::Iter<'r, T>>
197+
where
198+
Self: 'r;
190199

191200
#[inline]
192201
fn batch_values_iter(&self) -> Self::BatchValuesIter<'_> {
@@ -197,7 +206,10 @@ impl<T: SerializeRow> BatchValues for Vec<T> {
197206
// Here is an example implementation for (T0, )
198207
// Further variants are done using a macro
199208
impl<T0: SerializeRow> BatchValues for (T0,) {
200-
type BatchValuesIter<'r> = BatchValuesIteratorFromIterator<std::iter::Once<&'r T0>> where Self: 'r;
209+
type BatchValuesIter<'r>
210+
= BatchValuesIteratorFromIterator<std::iter::Once<&'r T0>>
211+
where
212+
Self: 'r;
201213

202214
#[inline]
203215
fn batch_values_iter(&self) -> Self::BatchValuesIter<'_> {
@@ -302,8 +314,11 @@ impl_batch_values_for_tuple!(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T
302314
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15; 16);
303315

304316
// Every &impl BatchValues should also implement BatchValues
305-
impl<'a, T: BatchValues + ?Sized> BatchValues for &'a T {
306-
type BatchValuesIter<'r> = <T as BatchValues>::BatchValuesIter<'r> where Self: 'r;
317+
impl<T: BatchValues + ?Sized> BatchValues for &T {
318+
type BatchValuesIter<'r>
319+
= <T as BatchValues>::BatchValuesIter<'r>
320+
where
321+
Self: 'r;
307322

308323
#[inline]
309324
fn batch_values_iter(&self) -> Self::BatchValuesIter<'_> {
@@ -323,7 +338,8 @@ impl<T> BatchValues for LegacyBatchValuesAdapter<T>
323338
where
324339
T: LegacyBatchValues,
325340
{
326-
type BatchValuesIter<'r> = LegacyBatchValuesIteratorAdapter<T::LegacyBatchValuesIter<'r>>
341+
type BatchValuesIter<'r>
342+
= LegacyBatchValuesIteratorAdapter<T::LegacyBatchValuesIter<'r>>
327343
where
328344
Self: 'r;
329345

0 commit comments

Comments
 (0)