Merge pull request #66 from epage/rename

chore: Update to anstream

Author: epage

Cargo.lock

@@ -37,13 +37,13 @@ env_logger = { version = "0.10.0", default-features = false, features = ["color"
 concolor = "0.1.1"
 concolor-clap = { version = "0.1.0", features = ["api"] }
 proc-exit = "2.0.1"
-human-panic = "1.1.2"
+human-panic = "1.1.3"
 anyhow = "1.0.68"
 syntect = { version = "5.0.0", default-features = false, features = ["parsing", "regex-fancy"] }
 terminal_size = "0.2.3"
 textwrap = "0.16.0"
 anstyle = "0.3.1"
-anstyle-stream = "0.2.2"
+anstream = "0.2.2"
 is-terminal = "0.4.4"
 content_inspector = "0.2.4"
 encoding = "0.2.33"
@@ -57,5 +57,5 @@ once_cell = "1.17.0"
 bugreport = "0.5.0"
 
 [dev-dependencies]
-snapbox = { version = "0.4.9", features = ["path"] }
+snapbox = { version = "0.4.10", features = ["path"] }
 term-transcript = "0.2.0"

Cargo.toml

@@ -12,8 +12,8 @@ pub fn blame(
     config: &mut Config,
     args: &crate::args::Args,
 ) -> proc_exit::ExitResult {
-    let colored_stdout = anstyle_stream::AutoStream::choice(&std::io::stdout())
-        != anstyle_stream::ColorChoice::Never;
+    let colored_stdout =
+        anstream::AutoStream::choice(&std::io::stdout()) != anstream::ColorChoice::Never;
     let total_width = terminal_size::terminal_size()
         .map(|(w, _h)| w.0)
         .or_else(|| std::env::var_os("COLUMNS").and_then(|s| s.to_str()?.parse::<u16>().ok()))

src/blame.rs

@@ -16,7 +16,7 @@ pub fn dump_config(output_path: &std::path::Path, config: &mut Config) -> proc_e
 
     if output_path == std::path::Path::new("-") {
         use std::io::Write;
-        anstyle_stream::stdout()
+        anstream::stdout()
             .write_all(output.as_bytes())
             .with_code(proc_exit::Code::FAILURE)?;
     } else {

src/config.rs

@@ -7,21 +7,21 @@ pub struct Pager {
 
 impl Pager {
     pub fn stdout(args: &str) -> Self {
-        let cmd = anstyle_stream::stdout()
+        let cmd = anstream::stdout()
             .is_terminal()
             .then(|| parse(args))
             .flatten();
         Self { cmd }
     }
 
     pub fn start(&mut self) -> ActivePager {
-        let stdout = anstyle_stream::stdout().lock();
+        let stdout = anstream::stdout().lock();
         if let Some(cmd) = &mut self.cmd {
             // should use pager instead of stderr
             if let Ok(p) = cmd.spawn() {
-                let stderr = anstyle_stream::stderr()
+                let stderr = anstream::stderr()
                     .is_terminal()
-                    .then(|| anstyle_stream::stderr().lock());
+                    .then(|| anstream::stderr().lock());
                 ActivePager {
                     primary: stdout,
                     _secondary: stderr,
@@ -45,8 +45,8 @@ impl Pager {
 }
 
 pub struct ActivePager {
-    primary: anstyle_stream::AutoStream<std::io::StdoutLock<'static>>,
-    _secondary: Option<anstyle_stream::AutoStream<std::io::StderrLock<'static>>>,
+    primary: anstream::AutoStream<std::io::StdoutLock<'static>>,
+    _secondary: Option<anstream::AutoStream<std::io::StderrLock<'static>>>,
     pager: Option<std::process::Child>,
 }
 

src/git_pager.rs

@@ -56,11 +56,7 @@ fn run() -> proc_exit::ExitResult {
         list_themes(&mut config)?;
     } else if args.acknowledgements {
         use std::io::Write;
-        let _ = writeln!(
-            anstyle_stream::stdout(),
-            "{}",
-            assets::get_acknowledgements()
-        );
+        let _ = writeln!(anstream::stdout(), "{}", assets::get_acknowledgements());
     } else if args.diagnostic {
         use bugreport::{bugreport, collector::*, format::Markdown};
 
@@ -150,8 +146,8 @@ fn list_languages(config: &mut Config) -> proc_exit::ExitResult {
 }
 
 fn list_themes(config: &mut Config) -> proc_exit::ExitResult {
-    let colored_stdout = anstyle_stream::AutoStream::choice(&std::io::stdout())
-        != anstyle_stream::ColorChoice::Never;
+    let colored_stdout =
+        anstream::AutoStream::choice(&std::io::stdout()) != anstream::ColorChoice::Never;
     let pager = config.get(&crate::git2_config::PAGER);
     let mut pager = Pager::stdout(&pager);
     let mut pager = pager.start();