From 5699b98e28624b3de8ece19a24df478376f09647 Mon Sep 17 00:00:00 2001 From: Min Kim Date: Mon, 3 Jun 2024 12:56:52 -0700 Subject: [PATCH] Group imports by StdExternalCrate --- .github/workflows/ci.yml | 2 +- src/frame.rs | 3 ++- src/message.rs | 6 ++++-- src/request.rs | 3 ++- src/test.rs | 4 +++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32ad7e0..2802436 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: with: components: clippy, rustfmt - name: Check formatting - run: cargo fmt -- --check + run: cargo fmt -- --check --config group_imports=StdExternalCrate - name: Clippy run: cargo clippy -- -D warnings -W clippy::pedantic - name: markdownlint diff --git a/src/frame.rs b/src/frame.rs index 37f1e27..01f0c50 100644 --- a/src/frame.rs +++ b/src/frame.rs @@ -1,9 +1,10 @@ //! Functions and errors for handling length-delimited frames. +use std::{io, mem}; + use bincode::Options; use quinn::{RecvStream, SendStream}; use serde::{Deserialize, Serialize}; -use std::{io, mem}; /// Receives and deserializes a message with a big-endian 4-byte length header. /// diff --git a/src/message.rs b/src/message.rs index b7c090a..c071273 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1,10 +1,12 @@ //! Functions and errors for handling messages. -use crate::frame; +use std::{fmt, io, mem}; + use bincode::Options; use quinn::{RecvStream, SendStream}; use serde::Serialize; -use std::{fmt, io, mem}; + +use crate::frame; /// Receives a message as a stream of bytes with a big-endian 4-byte length /// header. diff --git a/src/request.rs b/src/request.rs index 24ad878..723689e 100644 --- a/src/request.rs +++ b/src/request.rs @@ -2,11 +2,12 @@ use std::io; -use crate::{frame, message}; use bincode::Options; use quinn::SendStream; use serde::{Deserialize, Serialize}; +use crate::{frame, message}; + /// Parses the arguments of a request. /// /// # Errors diff --git a/src/test.rs b/src/test.rs index 63f19de..832bd61 100644 --- a/src/test.rs +++ b/src/test.rs @@ -22,11 +22,13 @@ lazy_static! { /// Creates a bidirectional channel, returning server's send and receive and /// client's send and receive streams. pub(crate) async fn channel() -> Channel { - use rustls::pki_types::{CertificateDer, PrivatePkcs8KeyDer}; use std::{ net::{IpAddr, Ipv6Addr, SocketAddr}, sync::Arc, }; + + use rustls::pki_types::{CertificateDer, PrivatePkcs8KeyDer}; + const TEST_SERVER_NAME: &str = "test-server"; const TEST_PORT: u16 = 60190;