Merge pull request #113 from epage/clean

refactor: Clean up anstream related code
rust-cli · Aug 23, 2023 · 1d0bac9 · 1d0bac9
2 parents 9014ef6 + 912eaf4
commit 1d0bac9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/crates/anstream/src/auto.rs b/crates/anstream/src/auto.rs
@@ -130,7 +130,7 @@ where
             StreamInner::PassThrough(w) => w.is_terminal(),
             StreamInner::Strip(w) => w.is_terminal(),
             #[cfg(all(windows, feature = "wincon"))]
-            StreamInner::Wincon(w) => true,
+            StreamInner::Wincon(_) => true, // its only ever a terminal
         }
     }
 }

diff --git a/crates/anstyle-wincon/src/console.rs b/crates/anstyle-wincon/src/console.rs
@@ -106,6 +106,18 @@ where
     }
 }
 
+impl<S> Drop for Console<S>
+where
+    S: crate::WinconStream + std::io::Write,
+{
+    fn drop(&mut self) {
+        // Otherwise `Console::lock` took it
+        if self.stream.is_some() {
+            let _ = self.reset();
+        }
+    }
+}
+
 impl<S> Console<S>
 where
     S: crate::WinconStream + std::io::Write,
@@ -142,15 +154,3 @@ where
         self.lock()
     }
 }
-
-impl<S> Drop for Console<S>
-where
-    S: crate::WinconStream + std::io::Write,
-{
-    fn drop(&mut self) {
-        // Otherwise `Console::lock` took it
-        if self.stream.is_some() {
-            let _ = self.reset();
-        }
-    }
-}