new rustfmt rules

benchmark/benchmark.rs

@@ -470,7 +470,7 @@ fn try_main() -> ::capnp::Result<()> {
         return Err(::capnp::Error::failed(format!(
             "Could not parse a u64 from: {}",
             args[5]
-        )))
+        )));
     };
 
     let mode = Mode::parse(&args[2])?;

capnp-futures/src/serialize.rs

@@ -52,7 +52,7 @@ where
     R: AsyncRead + Unpin,
 {
     let Some(segment_lengths_builder) = read_segment_table(&mut reader, options).await? else {
-        return Ok(None)
+        return Ok(None);
     };
     Ok(Some(
         read_segments(

capnp-rpc/src/rpc.rs

@@ -647,7 +647,7 @@ impl<VatId> ConnectionState<VatId> {
         let Some(state) = weak_state.upgrade() else {
             return Promise::err(Error::disconnected(
                 "message loop cannot continue without a connection".into(),
-            ))
+            ));
         };
 
         let promise = match *state.connection.borrow_mut() {
@@ -894,7 +894,7 @@ impl<VatId> ConnectionState<VatId> {
         let Some(connection_state) = weak_state.upgrade() else {
             return Err(Error::disconnected(
                 "handle_message() cannot continue without a connection".into(),
-            ))
+            ));
         };
 
         let reader = message.get_body()?.get_as::<message::Reader>()?;
@@ -2041,7 +2041,7 @@ impl<VatId> Pipeline<VatId> {
             let resolve_self_promise =
                 connection_state.eagerly_evaluate(fork.clone().then(move |response| {
                     let Some(state) = this.upgrade() else {
-                        return Promise::err(Error::failed("dangling reference to this".into()))
+                        return Promise::err(Error::failed("dangling reference to this".into()));
                     };
                     PipelineState::resolve(&state, response);
                     Promise::ok(())

capnp/src/dynamic_struct.rs

@@ -184,7 +184,7 @@ impl<'a> Reader<'a> {
     /// Otherwise, returns None.
     pub fn which(&self) -> Result<Option<Field>> {
         let node::Struct(st) = self.schema.get_proto().which()? else {
-            return Err(crate::Error::failed("not a struct".into()))
+            return Err(crate::Error::failed("not a struct".into()));
         };
         if st.get_discriminant_count() == 0 {
             Ok(None)
@@ -202,7 +202,7 @@ impl<'a> Reader<'a> {
         let proto = field.get_proto();
         if has_discriminant_value(proto) {
             let node::Struct(st) = self.schema.get_proto().which()? else {
-                return Err(crate::Error::failed("not a struct".into()))
+                return Err(crate::Error::failed("not a struct".into()));
             };
 
             let discrim = self
@@ -414,7 +414,7 @@ impl<'a> Builder<'a> {
 
     pub fn which(&self) -> Result<Option<Field>> {
         let node::Struct(st) = self.schema.get_proto().which()? else {
-            return Err(crate::Error::failed("not a struct".into()))
+            return Err(crate::Error::failed("not a struct".into()));
         };
         if st.get_discriminant_count() == 0 {
             Ok(None)
@@ -536,10 +536,10 @@ impl<'a> Builder<'a> {
             }
             field::Group(_group) => {
                 let dynamic_value::Reader::Struct(src) = value else {
-                    return Err(crate::Error::failed("not a struct".into()))
+                    return Err(crate::Error::failed("not a struct".into()));
                 };
                 let dynamic_value::Builder::Struct(mut dst) = self.reborrow().init(field)? else {
-                    return Err(crate::Error::failed("not a struct".into()))
+                    return Err(crate::Error::failed("not a struct".into()));
                 };
                 if let Some(union_field) = src.which()? {
                     dst.set(union_field, src.get(union_field)?)?;
@@ -591,7 +591,7 @@ impl<'a> Builder<'a> {
             field::Group(_) => {
                 self.clear(field)?;
                 let TypeVariant::Struct(schema) = ty.which() else {
-                    return Err(crate::Error::failed("not a struct".into()))
+                    return Err(crate::Error::failed("not a struct".into()));
                 };
                 Ok((Builder::new(self.builder, schema.into())).into())
             }
@@ -689,7 +689,7 @@ impl<'a> Builder<'a> {
             }
             field::Group(_) => {
                 let TypeVariant::Struct(schema) = ty.which() else {
-                    return Err(crate::Error::failed("not a struct".into()))
+                    return Err(crate::Error::failed("not a struct".into()));
                 };
                 let mut group = Builder::new(self.builder.reborrow(), schema.into());
 
@@ -716,7 +716,7 @@ impl<'a> Builder<'a> {
     fn set_in_union(&mut self, field: Field) -> Result<()> {
         if has_discriminant_value(field.get_proto()) {
             let node::Struct(st) = self.schema.get_proto().which()? else {
-                return Err(crate::Error::failed("not a struct".into()))
+                return Err(crate::Error::failed("not a struct".into()));
             };
             self.builder.set_data_field::<u16>(
                 st.get_discriminant_offset() as usize,

capnp/src/dynamic_value.rs

@@ -103,7 +103,9 @@ pub trait DowncastReader<'a> {
 
 impl<'a> DowncastReader<'a> for () {
     fn downcast_reader(value: Reader<'a>) -> () {
-        let Reader::Void = value else { panic!("error downcasting to void") };
+        let Reader::Void = value else {
+            panic!("error downcasting to void")
+        };
     }
 }
 
@@ -222,7 +224,9 @@ pub trait DowncastBuilder<'a> {
 
 impl<'a> DowncastBuilder<'a> for () {
     fn downcast_builder(value: Builder<'a>) -> () {
-        let Builder::Void = value else { panic!("error downcasting to void") };
+        let Builder::Void = value else {
+            panic!("error downcasting to void")
+        };
     }
 }
 

capnp/src/serialize.rs

@@ -76,7 +76,7 @@ pub fn read_message_from_flat_slice<'a>(
     let mut bytes = *slice;
     let orig_bytes_len = bytes.len();
     let Some(segment_lengths_builder) = read_segment_table(&mut bytes, options)? else {
-        return Err(Error::failed("empty slice".to_string()))
+        return Err(Error::failed("empty slice".to_string()));
     };
     let segment_table_bytes_len = orig_bytes_len - bytes.len();
     assert_eq!(segment_table_bytes_len % BYTES_PER_WORD, 0);
@@ -138,7 +138,7 @@ impl<T: Deref<Target = [u8]>> BufferSegments<T> {
         let mut segment_bytes = &*buffer;
 
         let Some(segment_table) = read_segment_table(&mut segment_bytes, options)? else {
-            return Err(Error::failed("empty buffer".to_string()))
+            return Err(Error::failed("empty buffer".to_string()));
         };
         let segment_table_bytes_len = buffer.len() - segment_bytes.len();
 
@@ -279,7 +279,7 @@ where
     R: Read,
 {
     let Some(owned_segments_builder) = read_segment_table(&mut read, options)? else {
-        return Err(Error::failed("Premature end of file".to_string()))
+        return Err(Error::failed("Premature end of file".to_string()));
     };
     read_segments(
         &mut read,
@@ -298,7 +298,9 @@ pub fn try_read_message<R>(
 where
     R: Read,
 {
-    let Some(owned_segments_builder) = read_segment_table(&mut read, options)? else { return Ok(None) };
+    let Some(owned_segments_builder) = read_segment_table(&mut read, options)? else {
+        return Ok(None);
+    };
     Ok(Some(read_segments(
         &mut read,
         owned_segments_builder.into_owned_segments(),

capnpc/src/codegen.rs

@@ -302,7 +302,9 @@ impl<'a> GeneratorContext<'a> {
         node_id: u64,
     ) -> ::capnp::Result<()> {
         // unused nodes in imported files might be omitted from the node map
-        let Some(&node_reader) = self.node_map.get(&node_id) else { return Ok(()) };
+        let Some(&node_reader) = self.node_map.get(&node_id) else {
+            return Ok(());
+        };
 
         for annotation in node_reader.get_annotations()? {
             if annotation.get_id() == NAME_ANNOTATION_ID {
@@ -1328,7 +1330,9 @@ fn used_params_of_brand(
     let brand_scopes = brand_scopes; // freeze
     let mut current_node_id = node_id;
     loop {
-        let Some(current_node) = ctx.node_map.get(&current_node_id) else { break };
+        let Some(current_node) = ctx.node_map.get(&current_node_id) else {
+            break;
+        };
         let params = current_node.get_parameters()?;
         match brand_scopes.get(&current_node_id) {
             None => (),

capnpc/test/test.rs

@@ -114,7 +114,11 @@ mod tests {
             schema::StructSchema,
         };
 
-        let TypeVariant::Struct(schema) = field_subset_indexes_correctly::Owned::introspect().which() else { unreachable!() };
+        let TypeVariant::Struct(schema) =
+            field_subset_indexes_correctly::Owned::introspect().which()
+        else {
+            unreachable!()
+        };
         let schema = StructSchema::new(schema);
 
         let subset = schema.get_non_union_fields().unwrap();