From 3fbdf403dc0bc1865cfce136ddf8ea4db7194cee Mon Sep 17 00:00:00 2001 From: David Barsky Date: Sun, 5 Dec 2021 16:52:41 -0500 Subject: [PATCH 1/3] Default to stderr --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 595af5c..9009eba 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -44,7 +44,7 @@ impl Visit for Data { } #[derive(Debug)] -pub struct HierarchicalLayer io::Stdout> +pub struct HierarchicalLayer io::Stderr> where W: for<'writer> MakeWriter<'writer> + 'static, { From 2e6186a9fc97c118b52d9a9d9487243f8e7de588 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Sun, 5 Dec 2021 16:55:33 -0500 Subject: [PATCH 2/3] whoops one more --- src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9009eba..9bb8858 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -59,16 +59,16 @@ impl Default for HierarchicalLayer { } } -impl HierarchicalLayer io::Stdout> { +impl HierarchicalLayer io::Stderr> { pub fn new(indent_amount: usize) -> Self { - let ansi = atty::is(atty::Stream::Stdout); + let ansi = atty::is(atty::Stream::Stderr); let config = Config { ansi, indent_amount, ..Default::default() }; Self { - make_writer: io::stdout, + make_writer: io::stderr, bufs: Mutex::new(Buffers::new()), config, } From 05896e5964e490f43bebaf5647e60a1cbe18a298 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Sun, 5 Dec 2021 17:09:48 -0500 Subject: [PATCH 3/3] update tests to use stderr as appropriate --- examples/basic.rs | 1 + examples/quiet.rs | 1 + examples/stderr.rs | 3 +-- examples/wraparound.rs | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/basic.rs b/examples/basic.rs index 52ff9cb..97f6263 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -4,6 +4,7 @@ use tracing_tree::HierarchicalLayer; fn main() { let layer = HierarchicalLayer::default() + .with_writer(std::io::stdout) .with_indent_lines(true) .with_indent_amount(2) .with_thread_names(true) diff --git a/examples/quiet.rs b/examples/quiet.rs index 58ac05a..81b0c9c 100644 --- a/examples/quiet.rs +++ b/examples/quiet.rs @@ -4,6 +4,7 @@ use tracing_tree::HierarchicalLayer; fn main() { let layer = HierarchicalLayer::default() + .with_writer(std::io::stdout) .with_indent_lines(true) .with_indent_amount(2) .with_thread_names(true) diff --git a/examples/stderr.rs b/examples/stderr.rs index ab9868c..75880a3 100644 --- a/examples/stderr.rs +++ b/examples/stderr.rs @@ -29,8 +29,7 @@ fn main() { let layer = HierarchicalLayer::default() .with_indent_lines(true) .with_indent_amount(2) - .with_bracketed_fields(true) - .with_writer(std::io::stderr); + .with_bracketed_fields(true); let subscriber = Registry::default().with(layer); tracing::subscriber::set_global_default(subscriber).unwrap(); diff --git a/examples/wraparound.rs b/examples/wraparound.rs index 24586c3..e045eb9 100644 --- a/examples/wraparound.rs +++ b/examples/wraparound.rs @@ -4,6 +4,7 @@ use tracing_tree::HierarchicalLayer; fn main() { let layer = HierarchicalLayer::default() + .with_writer(std::io::stdout) .with_indent_lines(true) .with_indent_amount(2) .with_thread_names(true)