Merge branch 'v0.1.x' into eliza/backport-#1716

tokio-rs · Dec 17, 2021 · 5af0788 · 5af0788
2 parents fbfa546 + 6ede79c
commit 5af0788
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/tracing-appender/README.md b/tracing-appender/README.md
@@ -53,7 +53,7 @@ This crate can be used in a few ways to record spans/events:
  - Using *any* type implementing [`std::io::Write`][write] in a 
  non-blocking fashion.
  - Using [`NonBlocking`][non_blocking] and [`RollingFileAppender`][file_appender] 
- together to write to write to log files in a non-blocking fashion.
+ together to write to log files in a non-blocking fashion.
 
 ## Rolling File Appender
 
@@ -137,7 +137,7 @@ fn main() {
 [tracing]: https://docs.rs/tracing/latest/tracing/
 [make_writer]: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/fmt/trait.MakeWriter.html
 [write]: https://doc.rust-lang.org/std/io/trait.Write.html
-[non_blocking]: https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/indexx.html
+[non_blocking]: https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/index.html
 [rolling]: https://docs.rs/tracing-appender/latest/tracing_appender/rolling/index.html
 [guard]: https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/struct.WorkerGuard.html
 [file_appender]: https://docs.rs/tracing-appender/latest/tracing_appender/rolling/struct.RollingFileAppender.html

diff --git a/tracing-core/src/subscriber.rs b/tracing-core/src/subscriber.rs
@@ -567,15 +567,9 @@ impl Interest {
 ///
 /// [`NoSubscriber`] implements the [`Subscriber`] trait by never being enabled,
 /// never being interested in any callsite, and dropping all spans and events.
-#[derive(Debug, Copy, Clone)]
+#[derive(Copy, Clone, Debug, Default)]
 pub struct NoSubscriber(());
 
-impl Default for NoSubscriber {
-    fn default() -> Self {
-        NoSubscriber(())
-    }
-}
-
 impl Subscriber for NoSubscriber {
     #[inline]
     fn register_callsite(&self, _: &'static Metadata<'static>) -> Interest {

diff --git a/tracing-flame/Cargo.toml b/tracing-flame/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tracing-flame"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
     "Jane Lusby <jlusby@yaah.dev>",
     "Tokio Contributors <team@tokio.rs>"

diff --git a/tracing-opentelemetry/src/span_ext.rs b/tracing-opentelemetry/src/span_ext.rs
@@ -22,7 +22,7 @@ pub trait OpenTelemetrySpanExt {
     /// use std::collections::HashMap;
     /// use tracing::Span;
     ///
-    /// // Example carrier, could be a framework header map that impls otel's `Extract`.
+    /// // Example carrier, could be a framework header map that impls otel's `Extractor`.
     /// let mut carrier = HashMap::new();
     ///
     /// // Propagator can be swapped with b3 propagator, jaeger propagator, etc.
@@ -56,7 +56,7 @@ pub trait OpenTelemetrySpanExt {
     /// use std::collections::HashMap;
     /// use tracing::Span;
     ///
-    /// // Example carrier, could be a framework header map that impls otel's `Extract`.
+    /// // Example carrier, could be a framework header map that impls otel's `Extractor`.
     /// let mut carrier = HashMap::new();
     ///
     /// // Propagator can be swapped with b3 propagator, jaeger propagator, etc.