add import fmt

s1rius · Oct 14, 2023 · 8937fd9 · 8937fd9
1 parent c7259b7
commit 8937fd9
Show file tree

Hide file tree

Showing 20 changed files with 361 additions and 108 deletions.
diff --git a/examples/android_preview/src/lib.rs b/examples/android_preview/src/lib.rs
@@ -1,5 +1,10 @@
 use ezlog::{
-    CipherKind, CompressKind, EZLogCallback, EZLogConfig, EZLogConfigBuilder, EZRecordBuilder,
+    CipherKind,
+    CompressKind,
+    EZLogCallback,
+    EZLogConfig,
+    EZLogConfigBuilder,
+    EZRecordBuilder,
     DEFAULT_LOG_NAME,
 };
 use rand::Rng;

diff --git a/examples/hello_world.rs b/examples/hello_world.rs
@@ -1,16 +1,35 @@
 use std::fs::OpenOptions;
-use std::io::{BufReader, BufWriter, Cursor, Read};
-
+use std::io::{
+    BufReader,
+    BufWriter,
+    Cursor,
+    Read,
+};
 use std::thread;
 use std::time::Duration;
 
 use ezlog::Level;
 use ezlog::{
-    create_log, CipherKind, CompressKind, EZLogCallback, EZLogConfig, EZLogConfigBuilder,
-    EventPrinter, Header,
+    create_log,
+    CipherKind,
+    CompressKind,
+    EZLogCallback,
+    EZLogConfig,
+    EZLogConfigBuilder,
+    EventPrinter,
+    Header,
+};
+use ezlog::{
+    EZLogger,
+    EZMsg,
+};
+use log::{
+    debug,
+    error,
+    info,
+    trace,
+    warn,
 };
-use ezlog::{EZLogger, EZMsg};
-use log::{debug, error, info, trace, warn};
 use rand::Rng;
 use time::OffsetDateTime;
 

diff --git a/examples/nest_log/src/main.rs b/examples/nest_log/src/main.rs
@@ -2,8 +2,15 @@ use std::thread::sleep;
 use std::time::Duration;
 
 use ezlog::EZLogConfigBuilder;
-use log::{error, info, warn};
-use log::{LevelFilter, Log};
+use log::{
+    error,
+    info,
+    warn,
+};
+use log::{
+    LevelFilter,
+    Log,
+};
 
 extern crate log;
 

diff --git a/ezlog-core/src/appender.rs b/ezlog-core/src/appender.rs
@@ -1,12 +1,22 @@
 use std::{
     fs::OpenOptions,
-    io::{BufReader, BufWriter, Error, ErrorKind},
+    io::{
+        BufReader,
+        BufWriter,
+        Error,
+        ErrorKind,
+    },
     path::PathBuf,
     rc::Rc,
 };
+
 use time::OffsetDateTime;
 
-use crate::{events::event, logger::Header, *};
+use crate::{
+    events::event,
+    logger::Header,
+    *,
+};
 
 pub trait AppenderInner: Write {
     /// check have enough space to write record
@@ -441,14 +451,21 @@ impl Write for NopInner {
 #[cfg(test)]
 mod tests {
 
-    use std::fs::{self, File, OpenOptions};
-    use std::io::{BufReader, Seek, SeekFrom};
+    use std::fs::{
+        self,
+        File,
+        OpenOptions,
+    };
+    use std::io::{
+        BufReader,
+        Seek,
+        SeekFrom,
+    };
 
     use time::Duration;
 
-    use crate::config::EZLogConfigBuilder;
-
     use super::*;
+    use crate::config::EZLogConfigBuilder;
 
     fn create_all_feature_config() -> EZLogConfigBuilder {
         let key = b"an example very very secret key.";

diff --git a/ezlog-core/src/compress.rs b/ezlog-core/src/compress.rs
@@ -1,6 +1,13 @@
-use std::io::{Read, Write};
+use std::io::{
+    Read,
+    Write,
+};
 
-use crate::{CompressLevel, Compression, Decompression};
+use crate::{
+    CompressLevel,
+    Compression,
+    Decompression,
+};
 
 pub struct ZlibCodec {
     level: flate2::Compression,

diff --git a/ezlog-core/src/config.rs b/ezlog-core/src/config.rs
@@ -2,20 +2,47 @@ use std::{
     cmp,
     collections::hash_map::DefaultHasher,
     fmt,
-    fs::{self, File, OpenOptions},
-    hash::{Hash, Hasher},
-    path::{Path, PathBuf},
+    fs::{
+        self,
+        File,
+        OpenOptions,
+    },
+    hash::{
+        Hash,
+        Hasher,
+    },
+    path::{
+        Path,
+        PathBuf,
+    },
 };
 
-use memmap2::{MmapMut, MmapOptions};
-use time::{format_description, Date, Duration, OffsetDateTime};
+use memmap2::{
+    MmapMut,
+    MmapOptions,
+};
+use time::{
+    format_description,
+    Date,
+    Duration,
+    OffsetDateTime,
+};
 
 use crate::events::Event;
 #[allow(unused_imports)]
 use crate::EZLogger;
 use crate::{
-    errors::LogError, events::event, logger::Header, CipherKind, CompressKind, CompressLevel,
-    Version, DEFAULT_LOG_FILE_SUFFIX, DEFAULT_LOG_NAME, DEFAULT_MAX_LOG_SIZE, LOG_LEVEL_NAMES,
+    errors::LogError,
+    events::event,
+    logger::Header,
+    CipherKind,
+    CompressKind,
+    CompressLevel,
+    Version,
+    DEFAULT_LOG_FILE_SUFFIX,
+    DEFAULT_LOG_NAME,
+    DEFAULT_MAX_LOG_SIZE,
+    LOG_LEVEL_NAMES,
     MIN_LOG_SIZE,
 };
 
@@ -548,10 +575,23 @@ impl fmt::Display for Level {
 #[cfg(test)]
 mod tests {
 
-    use std::fs::{self, OpenOptions};
-
-    use crate::{appender::EZAppender, CipherKind, CompressKind, EZLogConfigBuilder};
-    use time::{macros::datetime, Duration, OffsetDateTime};
+    use std::fs::{
+        self,
+        OpenOptions,
+    };
+
+    use time::{
+        macros::datetime,
+        Duration,
+        OffsetDateTime,
+    };
+
+    use crate::{
+        appender::EZAppender,
+        CipherKind,
+        CompressKind,
+        EZLogConfigBuilder,
+    };
 
     #[test]
     fn test_config_cipher_hash() {

diff --git a/ezlog-core/src/crypto.rs b/ezlog-core/src/crypto.rs
@@ -1,8 +1,14 @@
-use aead::{Aead, KeyInit};
+use aead::{
+    Aead,
+    KeyInit,
+};
 use aes_gcm_siv::Nonce;
 
 use crate::errors::LogError;
-use crate::{Decryptor, Encryptor};
+use crate::{
+    Decryptor,
+    Encryptor,
+};
 
 pub struct Aes256GcmSiv {
     // 96-bits; unique per message

diff --git a/ezlog-core/src/decode.rs b/ezlog-core/src/decode.rs
@@ -1,11 +1,27 @@
-use std::io::{self, BufRead, Cursor, Write};
+use std::io::{
+    self,
+    BufRead,
+    Cursor,
+    Write,
+};
 
-use byteorder::{BigEndian, ReadBytesExt};
+use byteorder::{
+    BigEndian,
+    ReadBytesExt,
+};
 use integer_encoding::VarIntReader;
 
 use crate::{
-    errors::LogError, Compress, Cryptor, EZLogger, Header, NonceGenFn, Result, Version,
-    RECORD_SIGNATURE_END, RECORD_SIGNATURE_START,
+    errors::LogError,
+    Compress,
+    Cryptor,
+    EZLogger,
+    Header,
+    NonceGenFn,
+    Result,
+    Version,
+    RECORD_SIGNATURE_END,
+    RECORD_SIGNATURE_START,
 };
 
 #[inline]
@@ -170,10 +186,20 @@ pub fn decode_record_content(
 
 #[cfg(test)]
 mod tests {
-    use crate::decode::decode_logs_count;
-    use crate::{decode, EZLogger, EZRecordBuilder, Header};
     use std::fs;
-    use std::io::{BufReader, Cursor, Read};
+    use std::io::{
+        BufReader,
+        Cursor,
+        Read,
+    };
+
+    use crate::decode::decode_logs_count;
+    use crate::{
+        decode,
+        EZLogger,
+        EZRecordBuilder,
+        Header,
+    };
 
     #[cfg(feature = "decode")]
     fn create_all_feature_config() -> crate::EZLogConfig {

diff --git a/ezlog-core/src/errors.rs b/ezlog-core/src/errors.rs
@@ -1,6 +1,12 @@
-use std::{ffi::NulError, io};
+use std::{
+    ffi::NulError,
+    io,
+};
 
-use crossbeam_channel::{RecvError, TrySendError};
+use crossbeam_channel::{
+    RecvError,
+    TrySendError,
+};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -64,9 +70,10 @@ mod tests {
 
     #[test]
     fn test_error() {
-        use crate::errors::LogError;
         use std::io;
 
+        use crate::errors::LogError;
+
         let err = LogError::IoError(io::Error::new(io::ErrorKind::Other, "test"));
         assert_eq!(err.to_string(), "io error: test");
     }

diff --git a/ezlog-core/src/events.rs b/ezlog-core/src/events.rs
@@ -128,9 +128,10 @@ pub(crate) fn android_print(record: std::fmt::Arguments) {
     android_logger::log(&s);
 }
 
-use crate::errors::LogError;
 pub(crate) use println_with_time;
 
+use crate::errors::LogError;
+
 struct NopEvent;
 impl EventListener for NopEvent {
     fn on_event(&self, _event: Event, _desc: &str) {}

diff --git a/ezlog-core/src/ffi_c.rs b/ezlog-core/src/ffi_c.rs
@@ -1,17 +1,18 @@
+use core::slice;
+use std::ffi::CStr;
+use std::ffi::CString;
+use std::ffi::NulError;
+
+use libc::c_char;
+use libc::c_uchar;
+use libc::c_uint;
 use libc::c_void;
 use time::Duration;
 
 use crate::config::Level;
 use crate::events::EventPrinter;
 use crate::recorder::EZRecordBuilder;
 use crate::*;
-use core::slice;
-use libc::c_char;
-use libc::c_uchar;
-use libc::c_uint;
-use std::ffi::CStr;
-use std::ffi::CString;
-use std::ffi::NulError;
 
 /// Init ezlog, must call before any other function
 #[no_mangle]