Skip to content

Commit 2baca94

Browse files
ariel-miculasariel-miculas
committed
run cargo clippy --fix and cargo fmt in capnp
1 parent 873a1b7 commit 2baca94

File tree

5 files changed

+128
-67
lines changed

5 files changed

+128
-67
lines changed

‎capnp/src/dynamic_list.rs

+39-23
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl<'a> Builder<'a> {
162162
}
163163
}
164164

165-
pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
165+
pub fn reborrow(&mut self) -> Builder<'_> {
166166
Builder {
167167
builder: self.builder.reborrow(),
168168
element_type: self.element_type,
@@ -265,51 +265,67 @@ impl<'a> Builder<'a> {
265265
match (self.element_type.which(), value) {
266266
(TypeVariant::Void, _) => Ok(()),
267267
(TypeVariant::Bool, dynamic_value::Reader::Bool(b)) => {
268-
Ok(PrimitiveElement::set(&self.builder, index, b))
268+
PrimitiveElement::set(&self.builder, index, b);
269+
Ok(())
269270
}
270271
(TypeVariant::Int8, dynamic_value::Reader::Int8(x)) => {
271-
Ok(PrimitiveElement::set(&self.builder, index, x))
272+
PrimitiveElement::set(&self.builder, index, x);
273+
Ok(())
272274
}
273275
(TypeVariant::Int16, dynamic_value::Reader::Int16(x)) => {
274-
Ok(PrimitiveElement::set(&self.builder, index, x))
276+
PrimitiveElement::set(&self.builder, index, x);
277+
Ok(())
275278
}
276279
(TypeVariant::Int32, dynamic_value::Reader::Int32(x)) => {
277-
Ok(PrimitiveElement::set(&self.builder, index, x))
280+
PrimitiveElement::set(&self.builder, index, x);
281+
Ok(())
278282
}
279283
(TypeVariant::Int64, dynamic_value::Reader::Int64(x)) => {
280-
Ok(PrimitiveElement::set(&self.builder, index, x))
284+
PrimitiveElement::set(&self.builder, index, x);
285+
Ok(())
281286
}
282287
(TypeVariant::UInt8, dynamic_value::Reader::UInt8(x)) => {
283-
Ok(PrimitiveElement::set(&self.builder, index, x))
288+
PrimitiveElement::set(&self.builder, index, x);
289+
Ok(())
284290
}
285291
(TypeVariant::UInt16, dynamic_value::Reader::UInt16(x)) => {
286-
Ok(PrimitiveElement::set(&self.builder, index, x))
292+
PrimitiveElement::set(&self.builder, index, x);
293+
Ok(())
287294
}
288295
(TypeVariant::UInt32, dynamic_value::Reader::UInt32(x)) => {
289-
Ok(PrimitiveElement::set(&self.builder, index, x))
296+
PrimitiveElement::set(&self.builder, index, x);
297+
Ok(())
290298
}
291299
(TypeVariant::UInt64, dynamic_value::Reader::UInt64(x)) => {
292-
Ok(PrimitiveElement::set(&self.builder, index, x))
300+
PrimitiveElement::set(&self.builder, index, x);
301+
Ok(())
293302
}
294303
(TypeVariant::Float32, dynamic_value::Reader::Float32(x)) => {
295-
Ok(PrimitiveElement::set(&self.builder, index, x))
304+
PrimitiveElement::set(&self.builder, index, x);
305+
Ok(())
296306
}
297307
(TypeVariant::Float64, dynamic_value::Reader::Float64(x)) => {
298-
Ok(PrimitiveElement::set(&self.builder, index, x))
308+
PrimitiveElement::set(&self.builder, index, x);
309+
Ok(())
299310
}
300311
(TypeVariant::Enum(_es), dynamic_value::Reader::Enum(e)) => {
301-
Ok(PrimitiveElement::set(&self.builder, index, e.get_value()))
312+
PrimitiveElement::set(&self.builder, index, e.get_value());
313+
Ok(())
314+
}
315+
(TypeVariant::Text, dynamic_value::Reader::Text(t)) => {
316+
self.builder
317+
.reborrow()
318+
.get_pointer_element(index)
319+
.set_text(t);
320+
Ok(())
321+
}
322+
(TypeVariant::Data, dynamic_value::Reader::Data(d)) => {
323+
self.builder
324+
.reborrow()
325+
.get_pointer_element(index)
326+
.set_data(d);
327+
Ok(())
302328
}
303-
(TypeVariant::Text, dynamic_value::Reader::Text(t)) => Ok(self
304-
.builder
305-
.reborrow()
306-
.get_pointer_element(index)
307-
.set_text(t)),
308-
(TypeVariant::Data, dynamic_value::Reader::Data(d)) => Ok(self
309-
.builder
310-
.reborrow()
311-
.get_pointer_element(index)
312-
.set_data(d)),
313329
(TypeVariant::Struct(ss), dynamic_value::Reader::Struct(s)) => {
314330
assert_eq!(ss, s.get_schema().raw);
315331
self.builder

‎capnp/src/dynamic_struct.rs

+84-34
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,16 @@ impl<'a> Builder<'a> {
250250
Self { builder, schema }
251251
}
252252

253-
pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
253+
pub fn reborrow(&mut self) -> Builder<'_> {
254254
Builder {
255255
builder: self.builder.reborrow(),
256256
schema: self.schema,
257257
}
258258
}
259259

260-
pub fn reborrow_as_reader<'b>(&'b self) -> Reader<'b> {
260+
pub fn reborrow_as_reader(&self) -> Reader<'_> {
261261
Reader {
262-
reader: self.builder.as_reader().into(),
262+
reader: self.builder.as_reader(),
263263
schema: self.schema,
264264
}
265265
}
@@ -443,50 +443,63 @@ impl<'a> Builder<'a> {
443443
match (ty.which(), value, dval.which()?) {
444444
(TypeVariant::Void, _, _) => Ok(()),
445445
(TypeVariant::Bool, dynamic_value::Reader::Bool(v), value::Bool(b)) => {
446-
Ok(self.builder.set_bool_field_mask(offset, v, b))
446+
self.builder.set_bool_field_mask(offset, v, b);
447+
Ok(())
447448
}
448449
(TypeVariant::Int8, dynamic_value::Reader::Int8(v), value::Int8(d)) => {
449-
Ok(self.builder.set_data_field_mask::<i8>(offset, v, d))
450+
self.builder.set_data_field_mask::<i8>(offset, v, d);
451+
Ok(())
450452
}
451453
(TypeVariant::Int16, dynamic_value::Reader::Int16(v), value::Int16(d)) => {
452-
Ok(self.builder.set_data_field_mask::<i16>(offset, v, d))
454+
self.builder.set_data_field_mask::<i16>(offset, v, d);
455+
Ok(())
453456
}
454457
(TypeVariant::Int32, dynamic_value::Reader::Int32(v), value::Int32(d)) => {
455-
Ok(self.builder.set_data_field_mask::<i32>(offset, v, d))
458+
self.builder.set_data_field_mask::<i32>(offset, v, d);
459+
Ok(())
456460
}
457461
(TypeVariant::Int64, dynamic_value::Reader::Int64(v), value::Int64(d)) => {
458-
Ok(self.builder.set_data_field_mask::<i64>(offset, v, d))
462+
self.builder.set_data_field_mask::<i64>(offset, v, d);
463+
Ok(())
459464
}
460465
(TypeVariant::UInt8, dynamic_value::Reader::UInt8(v), value::Uint8(d)) => {
461-
Ok(self.builder.set_data_field_mask::<u8>(offset, v, d))
466+
self.builder.set_data_field_mask::<u8>(offset, v, d);
467+
Ok(())
462468
}
463469
(TypeVariant::UInt16, dynamic_value::Reader::UInt16(v), value::Uint16(d)) => {
464-
Ok(self.builder.set_data_field_mask::<u16>(offset, v, d))
470+
self.builder.set_data_field_mask::<u16>(offset, v, d);
471+
Ok(())
465472
}
466473
(TypeVariant::UInt32, dynamic_value::Reader::UInt32(v), value::Uint32(d)) => {
467-
Ok(self.builder.set_data_field_mask::<u32>(offset, v, d))
474+
self.builder.set_data_field_mask::<u32>(offset, v, d);
475+
Ok(())
468476
}
469477
(TypeVariant::UInt64, dynamic_value::Reader::UInt64(v), value::Uint64(d)) => {
470-
Ok(self.builder.set_data_field_mask::<u64>(offset, v, d))
478+
self.builder.set_data_field_mask::<u64>(offset, v, d);
479+
Ok(())
471480
}
472481
(
473482
TypeVariant::Float32,
474483
dynamic_value::Reader::Float32(v),
475484
value::Float32(d),
476-
) => Ok(self
477-
.builder
478-
.set_data_field_mask::<f32>(offset, v, d.to_bits())),
485+
) => {
486+
self.builder
487+
.set_data_field_mask::<f32>(offset, v, d.to_bits());
488+
Ok(())
489+
}
479490
(
480491
TypeVariant::Float64,
481492
dynamic_value::Reader::Float64(v),
482493
value::Float64(d),
483-
) => Ok(self
484-
.builder
485-
.set_data_field_mask::<f64>(offset, v, d.to_bits())),
494+
) => {
495+
self.builder
496+
.set_data_field_mask::<f64>(offset, v, d.to_bits());
497+
Ok(())
498+
}
486499
(TypeVariant::Enum(_), dynamic_value::Reader::Enum(ev), value::Enum(d)) => {
487-
Ok(self
488-
.builder
489-
.set_data_field_mask::<u16>(offset, ev.get_value(), d))
500+
self.builder
501+
.set_data_field_mask::<u16>(offset, ev.get_value(), d);
502+
Ok(())
490503
}
491504
(TypeVariant::Text, dynamic_value::Reader::Text(tv), _) => {
492505
let mut p = self.builder.reborrow().get_pointer_field(offset);
@@ -660,25 +673,62 @@ impl<'a> Builder<'a> {
660673
let offset = slot.get_offset() as usize;
661674
match ty.which() {
662675
TypeVariant::Void => Ok(()),
663-
TypeVariant::Bool => Ok(self.builder.set_bool_field(offset, false)),
664-
TypeVariant::Int8 => Ok(self.builder.set_data_field::<i8>(offset, 0)),
665-
TypeVariant::Int16 => Ok(self.builder.set_data_field::<i16>(offset, 0)),
666-
TypeVariant::Int32 => Ok(self.builder.set_data_field::<i32>(offset, 0)),
667-
TypeVariant::Int64 => Ok(self.builder.set_data_field::<i64>(offset, 0)),
668-
TypeVariant::UInt8 => Ok(self.builder.set_data_field::<u8>(offset, 0)),
669-
TypeVariant::UInt16 => Ok(self.builder.set_data_field::<u16>(offset, 0)),
670-
TypeVariant::UInt32 => Ok(self.builder.set_data_field::<u32>(offset, 0)),
671-
TypeVariant::UInt64 => Ok(self.builder.set_data_field::<u64>(offset, 0)),
672-
TypeVariant::Float32 => Ok(self.builder.set_data_field::<f32>(offset, 0f32)),
673-
TypeVariant::Float64 => Ok(self.builder.set_data_field::<f64>(offset, 0f64)),
674-
TypeVariant::Enum(_) => Ok(self.builder.set_data_field::<u16>(offset, 0)),
676+
TypeVariant::Bool => {
677+
self.builder.set_bool_field(offset, false);
678+
Ok(())
679+
}
680+
TypeVariant::Int8 => {
681+
self.builder.set_data_field::<i8>(offset, 0);
682+
Ok(())
683+
}
684+
TypeVariant::Int16 => {
685+
self.builder.set_data_field::<i16>(offset, 0);
686+
Ok(())
687+
}
688+
TypeVariant::Int32 => {
689+
self.builder.set_data_field::<i32>(offset, 0);
690+
Ok(())
691+
}
692+
TypeVariant::Int64 => {
693+
self.builder.set_data_field::<i64>(offset, 0);
694+
Ok(())
695+
}
696+
TypeVariant::UInt8 => {
697+
self.builder.set_data_field::<u8>(offset, 0);
698+
Ok(())
699+
}
700+
TypeVariant::UInt16 => {
701+
self.builder.set_data_field::<u16>(offset, 0);
702+
Ok(())
703+
}
704+
TypeVariant::UInt32 => {
705+
self.builder.set_data_field::<u32>(offset, 0);
706+
Ok(())
707+
}
708+
TypeVariant::UInt64 => {
709+
self.builder.set_data_field::<u64>(offset, 0);
710+
Ok(())
711+
}
712+
TypeVariant::Float32 => {
713+
self.builder.set_data_field::<f32>(offset, 0f32);
714+
Ok(())
715+
}
716+
TypeVariant::Float64 => {
717+
self.builder.set_data_field::<f64>(offset, 0f64);
718+
Ok(())
719+
}
720+
TypeVariant::Enum(_) => {
721+
self.builder.set_data_field::<u16>(offset, 0);
722+
Ok(())
723+
}
675724
TypeVariant::Text
676725
| TypeVariant::Data
677726
| TypeVariant::Struct(_)
678727
| TypeVariant::List(_)
679728
| TypeVariant::AnyPointer
680729
| TypeVariant::Capability => {
681-
Ok(self.builder.reborrow().get_pointer_field(offset).clear())
730+
self.builder.reborrow().get_pointer_field(offset).clear();
731+
Ok(())
682732
}
683733
}
684734
}

‎capnp/src/dynamic_value.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pub trait DowncastReader<'a> {
103103
}
104104

105105
impl<'a> DowncastReader<'a> for () {
106-
fn downcast_reader(value: Reader<'a>) -> () {
106+
fn downcast_reader(value: Reader<'a>) {
107107
let Reader::Void = value else { panic!("error downcasting to void") };
108108
}
109109
}
@@ -161,7 +161,7 @@ pub enum Builder<'a> {
161161
}
162162

163163
impl<'a> Builder<'a> {
164-
pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
164+
pub fn reborrow(&mut self) -> Builder<'_> {
165165
match self {
166166
Builder::Void => Builder::Void,
167167
Builder::Bool(b) => Builder::Bool(*b),
@@ -222,7 +222,7 @@ pub trait DowncastBuilder<'a> {
222222
}
223223

224224
impl<'a> DowncastBuilder<'a> for () {
225-
fn downcast_builder(value: Builder<'a>) -> () {
225+
fn downcast_builder(value: Builder<'a>) {
226226
let Builder::Void = value else { panic!("error downcasting to void") };
227227
}
228228
}

‎capnp/src/schema.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -406,12 +406,7 @@ impl AnnotationList {
406406
/// Returns the first annotation in the list that matches `id`.
407407
/// Otherwise returns `None`.
408408
pub fn find(self, id: u64) -> Option<Annotation> {
409-
for annotation in self.iter() {
410-
if annotation.get_id() == id {
411-
return Some(annotation);
412-
}
413-
}
414-
None
409+
self.iter().find(|&annotation| annotation.get_id() == id)
415410
}
416411

417412
pub fn iter(self) -> ListIter<Self, Annotation> {

‎capnp/src/text.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl<'a> Builder<'a> {
9494
self.pos = 0;
9595
}
9696

97-
pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
97+
pub fn reborrow(&mut self) -> Builder<'_> {
9898
Builder {
9999
bytes: self.bytes,
100100
pos: self.pos,

0 commit comments

Comments
 (0)