refactor: update rustfmt config

compio-rs · Sep 27, 2024 · 982e993 · 982e993
1 parent 90482ab
commit 982e993
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 62 deletions.
diff --git a/compio-driver/src/iocp/op.rs b/compio-driver/src/iocp/op.rs
@@ -112,9 +112,9 @@ fn get_wsa_fn<F>(handle: RawFd, fguid: GUID) -> io::Result<Option<F>> {
 }
 
 impl<
-    D: std::marker::Send + 'static,
-    F: (FnOnce() -> BufResult<usize, D>) + std::marker::Send + std::marker::Sync + 'static,
-> OpCode for Asyncify<F, D>
+        D: std::marker::Send + 'static,
+        F: (FnOnce() -> BufResult<usize, D>) + std::marker::Send + std::marker::Sync + 'static,
+    > OpCode for Asyncify<F, D>
 {
     fn op_type(&self) -> OpType {
         OpType::Blocking

diff --git a/compio-driver/src/iour/op.rs b/compio-driver/src/iour/op.rs
@@ -15,9 +15,9 @@ pub use crate::unix::op::*;
 use crate::{op::*, syscall, OpEntry, SharedFd};
 
 impl<
-    D: std::marker::Send + 'static,
-    F: (FnOnce() -> BufResult<usize, D>) + std::marker::Send + std::marker::Sync + 'static,
-> OpCode for Asyncify<F, D>
+        D: std::marker::Send + 'static,
+        F: (FnOnce() -> BufResult<usize, D>) + std::marker::Send + std::marker::Sync + 'static,
+    > OpCode for Asyncify<F, D>
 {
     fn create_entry(self: Pin<&mut Self>) -> OpEntry {
         OpEntry::Blocking

diff --git a/compio-driver/src/poll/op.rs b/compio-driver/src/poll/op.rs
@@ -19,9 +19,9 @@ pub use crate::unix::op::*;
 use crate::{op::*, SharedFd};
 
 impl<
-    D: std::marker::Send + 'static,
-    F: (FnOnce() -> BufResult<usize, D>) + std::marker::Send + std::marker::Sync + 'static,
-> OpCode for Asyncify<F, D>
+        D: std::marker::Send + 'static,
+        F: (FnOnce() -> BufResult<usize, D>) + std::marker::Send + std::marker::Sync + 'static,
+    > OpCode for Asyncify<F, D>
 {
     fn pre_submit(self: Pin<&mut Self>) -> io::Result<Decision> {
         Ok(Decision::blocking_dummy())

diff --git a/compio-fs/tests/utils.rs b/compio-fs/tests/utils.rs
@@ -64,13 +64,11 @@ async fn build_dir_mode_read_only() {
         .await
         .unwrap();
 
-    assert!(
-        compio_fs::metadata(new_dir)
-            .await
-            .expect("metadata result")
-            .permissions()
-            .readonly()
-    );
+    assert!(compio_fs::metadata(new_dir)
+        .await
+        .expect("metadata result")
+        .permissions()
+        .readonly());
 }
 
 #[compio_macros::test]

diff --git a/compio-io/tests/io.rs b/compio-io/tests/io.rs
@@ -1,9 +1,9 @@
 use std::io::Cursor;
 
-use compio_buf::{BufResult, IoBuf, IoBufMut, arrayvec::ArrayVec};
+use compio_buf::{arrayvec::ArrayVec, BufResult, IoBuf, IoBufMut};
 use compio_io::{
-    AsyncRead, AsyncReadAt, AsyncReadAtExt, AsyncReadExt, AsyncWrite, AsyncWriteAt,
-    AsyncWriteAtExt, AsyncWriteExt, split,
+    split, AsyncRead, AsyncReadAt, AsyncReadAtExt, AsyncReadExt, AsyncWrite, AsyncWriteAt,
+    AsyncWriteAtExt, AsyncWriteExt,
 };
 use futures_executor::block_on;
 

diff --git a/compio-quic/src/connection.rs b/compio-quic/src/connection.rs
@@ -1157,15 +1157,15 @@ pub(crate) mod h3_impl {
             cx: &mut Context<'_>,
         ) -> Poll<Result<Self::BidiStream, Self::OpenError>> {
             let (stream, is_0rtt) = ready!(self.0.poll_open_stream(Some(cx), Dir::Bi))?;
-            Poll::Ready(Ok(BidiStream::new(self.0.0.clone(), stream, is_0rtt)))
+            Poll::Ready(Ok(BidiStream::new(self.0 .0.clone(), stream, is_0rtt)))
         }
 
         fn poll_open_send(
             &mut self,
             cx: &mut Context<'_>,
         ) -> Poll<Result<Self::SendStream, Self::OpenError>> {
             let (stream, is_0rtt) = ready!(self.0.poll_open_stream(Some(cx), Dir::Uni))?;
-            Poll::Ready(Ok(SendStream::new(self.0.0.clone(), stream, is_0rtt)))
+            Poll::Ready(Ok(SendStream::new(self.0 .0.clone(), stream, is_0rtt)))
         }
 
         fn close(&mut self, code: Code, reason: &[u8]) {

diff --git a/compio-quic/src/endpoint.rs b/compio-quic/src/endpoint.rs
@@ -256,20 +256,19 @@ impl EndpointInner {
     async fn run(&self) -> io::Result<()> {
         let respond_fn = |buf: Vec<u8>, transmit: Transmit| self.respond(buf, transmit);
 
-        let mut recv_fut = pin!(
-            self.socket
-                .recv(Vec::with_capacity(
-                    self.state
-                        .lock()
-                        .unwrap()
-                        .endpoint
-                        .config()
-                        .get_max_udp_payload_size()
-                        .min(64 * 1024) as usize
-                        * self.socket.max_gro_segments(),
-                ))
-                .fuse()
-        );
+        let mut recv_fut = pin!(self
+            .socket
+            .recv(Vec::with_capacity(
+                self.state
+                    .lock()
+                    .unwrap()
+                    .endpoint
+                    .config()
+                    .get_max_udp_payload_size()
+                    .min(64 * 1024) as usize
+                    * self.socket.max_gro_segments(),
+            ))
+            .fuse());
 
         let mut event_stream = self.events.1.stream().ready_chunks(100);
 

diff --git a/compio-quic/src/send_stream.rs b/compio-quic/src/send_stream.rs
@@ -195,15 +195,12 @@ impl SendStream {
     /// This operation is *not* cancel-safe.
     pub async fn write_all(&mut self, buf: &[u8]) -> Result<(), WriteError> {
         let mut count = 0;
-        poll_fn(|cx| {
-            loop {
-                if count == buf.len() {
-                    return Poll::Ready(Ok(()));
-                }
-                let n =
-                    ready!(self.execute_poll_write(cx, |mut stream| stream.write(&buf[count..])))?;
-                count += n;
+        poll_fn(|cx| loop {
+            if count == buf.len() {
+                return Poll::Ready(Ok(()));
             }
+            let n = ready!(self.execute_poll_write(cx, |mut stream| stream.write(&buf[count..])))?;
+            count += n;
         })
         .await
     }
@@ -224,16 +221,14 @@ impl SendStream {
     /// This operation is *not* cancel-safe.
     pub async fn write_all_chunks(&mut self, bufs: &mut [Bytes]) -> Result<(), WriteError> {
         let mut chunks = 0;
-        poll_fn(|cx| {
-            loop {
-                if chunks == bufs.len() {
-                    return Poll::Ready(Ok(()));
-                }
-                let written = ready!(self.execute_poll_write(cx, |mut stream| {
-                    stream.write_chunks(&mut bufs[chunks..])
-                }))?;
-                chunks += written.chunks;
+        poll_fn(|cx| loop {
+            if chunks == bufs.len() {
+                return Poll::Ready(Ok(()));
             }
+            let written = ready!(self.execute_poll_write(cx, |mut stream| {
+                stream.write_chunks(&mut bufs[chunks..])
+            }))?;
+            chunks += written.chunks;
         })
         .await
     }
@@ -413,10 +408,9 @@ pub(crate) mod h3_impl {
         fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
             if let Some(data) = &mut self.buf {
                 while data.has_remaining() {
-                    let n = ready!(
-                        self.inner
-                            .execute_poll_write(cx, |mut stream| stream.write(data.chunk()))
-                    )?;
+                    let n = ready!(self
+                        .inner
+                        .execute_poll_write(cx, |mut stream| stream.write(data.chunk())))?;
                     data.advance(n);
                 }
             }
@@ -462,10 +456,9 @@ pub(crate) mod h3_impl {
                 "poll_send called while send stream is not ready"
             );
 
-            let n = ready!(
-                self.inner
-                    .execute_poll_write(cx, |mut stream| stream.write(buf.chunk()))
-            )?;
+            let n = ready!(self
+                .inner
+                .execute_poll_write(cx, |mut stream| stream.write(buf.chunk())))?;
             buf.advance(n);
             Poll::Ready(Ok(n))
         }

diff --git a/compio-runtime/src/runtime/send_wrapper.rs b/compio-runtime/src/runtime/send_wrapper.rs
@@ -54,7 +54,11 @@ impl<T> SendWrapper<T> {
     /// Returns a reference to the contained value, if valid.
     #[inline]
     pub fn get(&self) -> Option<&T> {
-        if self.valid() { Some(&self.data) } else { None }
+        if self.valid() {
+            Some(&self.data)
+        } else {
+            None
+        }
     }
 }
 

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,6 +1,6 @@
 unstable_features = true
 
-version = "Two"
+style_edition = "2021"
 
 group_imports = "StdExternalCrate"
 imports_granularity = "Crate"