Merge #10953

10953: minor: Bump `tracing` r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -36,8 +36,8 @@ limit = { path = "../limit", version = "0.0.0" }
 test_utils = { path = "../test_utils" }
 expect-test = "1.2.0-pre.1"
 tracing = "0.1"
-tracing-subscriber = { version = "0.2", default-features = false, features = [
+tracing-subscriber = { version = "0.3", default-features = false, features = [
     "env-filter",
     "registry",
 ] }
-tracing-tree = { version = "0.1.10" }
+tracing-tree = "0.2"

crates/hir_ty/Cargo.toml

@@ -34,14 +34,14 @@ rayon = "1.5"
 mimalloc = { version = "0.1.19", default-features = false, optional = true }
 lsp-server = "0.5.1"
 tracing = "0.1"
-tracing-subscriber = { version = "0.2", default-features = false, features = [
+tracing-subscriber = { version = "0.3", default-features = false, features = [
     "env-filter",
     "registry",
     "fmt",
     "tracing-log",
 ] }
 tracing-log = "0.1.2"
-tracing-tree = { version = "0.1.10" }
+tracing-tree = "0.2"
 always-assert = "0.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }

crates/rust-analyzer/Cargo.toml

@@ -2,17 +2,20 @@
 //! filter syntax and `tracing_appender` for non blocking output.
 
 use std::{
-    fmt::{self, Write},
+    fmt,
     fs::File,
-    io,
+    io::{self, Stderr},
     sync::Arc,
 };
 
 use rust_analyzer::Result;
 use tracing::{level_filters::LevelFilter, Event, Subscriber};
 use tracing_log::NormalizeEvent;
 use tracing_subscriber::{
-    fmt::{writer::BoxMakeWriter, FmtContext, FormatEvent, FormatFields, FormattedFields},
+    fmt::{
+        format::Writer, writer::BoxMakeWriter, FmtContext, FormatEvent, FormatFields,
+        FormattedFields, MakeWriter,
+    },
     layer::SubscriberExt,
     registry::LookupSpan,
     util::SubscriberInitExt,
@@ -25,6 +28,16 @@ pub(crate) struct Logger {
     file: Option<File>,
 }
 
+struct MakeWriterStderr;
+
+impl<'a> MakeWriter<'a> for MakeWriterStderr {
+    type Writer = Stderr;
+
+    fn make_writer(&'a self) -> Self::Writer {
+        io::stderr()
+    }
+}
+
 impl Logger {
     pub(crate) fn new(file: Option<File>, filter: Option<&str>) -> Logger {
         let filter = filter.map_or(EnvFilter::default(), EnvFilter::new);
@@ -54,7 +67,7 @@ impl Logger {
             .with_indent_lines(true)
             .with_ansi(false)
             .with_indent_amount(2)
-            .with_writer(std::io::stderr);
+            .with_writer(io::stderr);
 
         let writer = match self.file {
             Some(file) => BoxMakeWriter::new(Arc::new(file)),
@@ -96,7 +109,7 @@ where
     fn format_event(
         &self,
         ctx: &FmtContext<'_, S, N>,
-        writer: &mut dyn Write,
+        mut writer: Writer,
         event: &Event<'_>,
     ) -> fmt::Result {
         // Write level and target
@@ -135,7 +148,7 @@ where
         })?;
 
         // Write fields on the event
-        ctx.field_format().format_fields(writer, event)?;
+        ctx.field_format().format_fields(writer.by_ref(), event)?;
 
         writeln!(writer)
     }