Apply rustfmt's option group_imports=StdExternalCrate (#119)

Close: #118

.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

CHANGELOG.md

@@ -10,6 +10,12 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 ### Changed
 
 - Modified connection log structure to include total L2 frame length of a session.
+- Apply rustfmt's option `group_imports=StdExternalCrate`.
+  - Modify the code with the command `cargo fmt -- --config group_imports=StdExternalCrate`.
+    This command must be applied automatically or manually before all future pull
+    requests are submitted.
+  - Add `--config group_imports=StdExternalCrate` to the CI process like:
+    - `cargo fmt -- --check --config group_imports=StdExternalCrate`
 
 ## [0.17.0] - 2024-05-16
 

src/connection.rs

@@ -1,10 +1,11 @@
 //! Functions and errors for handling messages.
 
-use crate::frame::{self, recv_handshake, send_handshake, RecvError, SendError};
 use quinn::{Connection, ConnectionError, RecvStream, SendStream};
 use semver::{Version, VersionReq};
 use thiserror::Error;
 
+use crate::frame::{self, recv_handshake, send_handshake, RecvError, SendError};
+
 /// The error type for a handshake failure.
 #[derive(Debug, Error)]
 pub enum HandshakeError {

src/frame.rs

@@ -1,8 +1,9 @@
 //! Functions and errors for handling length-delimited frames.
 
+use std::{mem, num::TryFromIntError};
+
 use quinn::{RecvStream, SendStream};
 use serde::{Deserialize, Serialize};
-use std::{mem, num::TryFromIntError};
 use thiserror::Error;
 
 /// The error type for receiving and deserializing a frame.

src/ingest.rs

@@ -9,11 +9,12 @@ pub mod timeseries;
 
 use std::fmt::Display;
 
-use crate::frame::{self, RecvError, SendError};
-use crate::RawEventKind;
 use quinn::{RecvStream, SendStream};
 use serde::{Deserialize, Serialize};
 
+use crate::frame::{self, RecvError, SendError};
+use crate::RawEventKind;
+
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Packet {
     pub packet_timestamp: i64,
@@ -136,9 +137,10 @@ fn to_string_or_empty<T: Display>(option: Option<T>) -> String {
 mod tests {
     #[tokio::test]
     async fn ingest_send_recv() {
-        use crate::test::{channel, TOKEN};
         use std::{mem, net::IpAddr};
 
+        use crate::test::{channel, TOKEN};
+
         let _lock = TOKEN.lock().await;
         let mut channel = channel().await;
 

src/ingest/log.rs

@@ -1,11 +1,13 @@
-use crate::{ingest::to_string_or_empty, publish::range::ResponseRangeData};
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
 use std::{
     fmt::{Display, Formatter},
     net::IpAddr,
 };
 
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+
+use crate::{ingest::to_string_or_empty, publish::range::ResponseRangeData};
+
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Log {
     pub kind: String,

src/ingest/netflow.rs

@@ -1,10 +1,12 @@
-use crate::{ingest::convert_time_format, publish::range::ResponseRangeData};
-use serde::{Deserialize, Serialize};
 use std::{
     fmt::{Display, Formatter},
     net::IpAddr,
 };
 
+use serde::{Deserialize, Serialize};
+
+use crate::{ingest::convert_time_format, publish::range::ResponseRangeData};
+
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[allow(clippy::module_name_repetitions)]
 pub struct Netflow5 {

src/ingest/network.rs

@@ -1,13 +1,15 @@
-use crate::{
-    ingest::{as_str_or_default, convert_time_format, vec_to_string_or_default},
-    publish::range::ResponseRangeData,
+use std::{
+    fmt::{Display, Formatter},
+    net::IpAddr,
 };
+
 use anyhow::Result;
 use num_enum::FromPrimitive;
 use serde::{Deserialize, Serialize};
-use std::{
-    fmt::{Display, Formatter},
-    net::IpAddr,
+
+use crate::{
+    ingest::{as_str_or_default, convert_time_format, vec_to_string_or_default},
+    publish::range::ResponseRangeData,
 };
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]

src/ingest/statistics.rs

@@ -1,7 +1,9 @@
-use super::RawEventKind;
-use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
 
+use serde::{Deserialize, Serialize};
+
+use super::RawEventKind;
+
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Statistics {
     pub core: u32,

src/ingest/sysmon.rs

@@ -1,13 +1,15 @@
-use crate::{
-    ingest::{convert_time_format, vec_to_string_or_default},
-    publish::range::ResponseRangeData,
-};
-use serde::{Deserialize, Serialize};
 use std::{
     fmt::{Display, Formatter},
     net::IpAddr,
 };
 
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    ingest::{convert_time_format, vec_to_string_or_default},
+    publish::range::ResponseRangeData,
+};
+
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct ProcessCreate {
     pub agent_name: String,

src/ingest/timeseries.rs

@@ -1,7 +1,9 @@
-use crate::publish::range::ResponseRangeData;
+use std::fmt::{Display, Formatter};
+
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
+
+use crate::publish::range::ResponseRangeData;
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct PeriodicTimeSeries {

src/publish.rs

@@ -3,16 +3,18 @@
 pub mod range;
 pub mod stream;
 
+use std::{mem, net::IpAddr};
+
+use anyhow::Result;
+use quinn::{Connection, ConnectionError, RecvStream, SendStream};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use thiserror::Error;
+
 use self::{
     range::{MessageCode, ResponseRangeData},
     stream::{NodeType, RequestStreamRecord},
 };
 use crate::frame::{self, recv_bytes, recv_raw, send_bytes, send_raw, RecvError, SendError};
-use anyhow::Result;
-use quinn::{Connection, ConnectionError, RecvStream, SendStream};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use std::{mem, net::IpAddr};
-use thiserror::Error;
 
 /// The error type for a publish failure.
 #[allow(clippy::module_name_repetitions)]
@@ -448,12 +450,13 @@ pub async fn recv_ack_response(recv: &mut RecvStream) -> Result<(), PublishError
 
 #[cfg(test)]
 mod tests {
+    use std::net::IpAddr;
+    use std::str::FromStr;
+
     use crate::frame;
     use crate::ingest::network::Conn;
     use crate::publish::{recv_ack_response, PublishError};
     use crate::test::{channel, TOKEN};
-    use std::net::IpAddr;
-    use std::str::FromStr;
 
     #[tokio::test]
     async fn publish_send_recv() {

src/publish/stream.rs

@@ -1,7 +1,8 @@
+use std::net::IpAddr;
+
 use anyhow::{anyhow, Result};
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
-use std::net::IpAddr;
 
 pub const STREAM_REQUEST_ALL_SOURCE: &str = "all";
 

src/test.rs

@@ -22,11 +22,12 @@ 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;