del label

trace4rs/src/appenders/rolling.rs

@@ -1,23 +1,13 @@
 use std::{
     fs,
-    io::{
-        self,
-        LineWriter,
-        Write,
-    },
+    io::{self, LineWriter, Write},
 };
 
-use camino::{
-    Utf8Path,
-    Utf8PathBuf,
-};
+use camino::{Utf8Path, Utf8PathBuf};
 
 use crate::{
     env::try_expand_env_vars,
-    error::{
-        Error,
-        Result,
-    },
+    error::{Error, Result},
 };
 
 /// `LogFileMeta` allows us to keep track of an estimated length for a given
@@ -68,8 +58,8 @@ impl Trigger {
 #[derive(Clone)]
 pub struct FixedWindow {
     /// invariant last < count
-    last:    Option<usize>,
-    count:   usize,
+    last: Option<usize>,
+    count: usize,
     pattern: String,
 }
 impl FixedWindow {
@@ -95,7 +85,10 @@ impl FixedWindow {
     // eas: Idk why im so dumb but this function is _bad_.
     fn roll(&mut self, path: &Utf8Path) -> io::Result<()> {
         // if None, we just need to roll to zero, which happens after this block
-        'outer: {
+
+        // see todo below
+        // 'outer: {
+        {
             if let Some(mut c) = self.last {
                 // holding max rolls, saturation should be fine
                 if c.saturating_add(1) == self.count {
@@ -183,13 +176,13 @@ impl Roller {
 /// An appender which writes to a file and manages rolling said file, either to
 /// backups or by deletion.
 pub struct RollingFile {
-    path:    Utf8PathBuf,
+    path: Utf8PathBuf,
     /// Writer will always be some except when it is being rolled or if there
     /// was an error initing a new writer after abandonment of the previous.
-    writer:  Option<LineWriter<fs::File>>,
-    meta:    LogFileMeta,
+    writer: Option<LineWriter<fs::File>>,
+    meta: LogFileMeta,
     trigger: Trigger,
-    roller:  Roller,
+    roller: Roller,
 }
 impl RollingFile {
     const DEFAULT_FILE_NAME: &'static str = "log";
@@ -208,14 +201,14 @@ impl RollingFile {
         let expanded_path = try_expand_env_vars(p.as_ref());
         let (writer, meta) = {
             let writer = Self::new_writer(&expanded_path).map_err(|e| Error::CreateFailed {
-                path:   expanded_path.clone().into_owned(),
+                path: expanded_path.clone().into_owned(),
                 source: e,
             })?;
             let meta = writer
                 .get_ref()
                 .metadata()
                 .map_err(|e| Error::MetadataFailed {
-                    path:   expanded_path.clone().into_owned(),
+                    path: expanded_path.clone().into_owned(),
                     source: e,
                 })?;
             (writer, LogFileMeta::from_meta(&meta))
@@ -285,7 +278,7 @@ impl RollingFile {
     /// pattern: "{filename}.{}".
     ///
     /// ```ignore
-    /// 
+    ///
     /// make_qualified_pattern(Path::from("./foo/bar.log"), None); // -> "./foo/bar.log.{}"
     /// make_qualified_pattern(Path::from("./foo/bar.log"), Some("bar_roll.{}")); // -> "./foo/bar_roll.{}"
     /// ```