Merge branch 'master' into davidbarsky/have-pretty-field-formatter-re…

…ad-writer-config

README.md

@@ -129,7 +129,7 @@ use std::{error::Error, io};
 use tracing::{debug, error, info, span, warn, Level};
 
 // the `#[tracing::instrument]` attribute creates and enters a span
-// every time the instrumented function is called. The span is named after the
+// every time the instrumented function is called. The span is named after
 // the function or method. Parameters passed to the function are recorded as fields.
 #[tracing::instrument]
 pub fn shave(yak: usize) -> Result<(), Box<dyn Error + 'static>> {

examples/Cargo.toml

@@ -3,7 +3,7 @@ name = "tracing-examples"
 version = "0.0.0"
 publish = false
 edition = "2018"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = []

examples/examples/fmt/yak_shave.rs

@@ -4,7 +4,7 @@ use thiserror::Error;
 use tracing::{debug, error, info, span, trace, warn, Level};
 
 // the `#[tracing::instrument]` attribute creates and enters a span
-// every time the instrumented function is called. The span is named after the
+// every time the instrumented function is called. The span is named after
 // the function or method. Paramaters passed to the function are recorded as fields.
 #[tracing::instrument]
 pub fn shave(yak: usize) -> Result<(), Box<dyn Error + 'static>> {
@@ -47,7 +47,7 @@ pub fn shave_all(yaks: usize) -> usize {
 
         if let Err(ref error) = res {
             // Like spans, events can also use the field initialization shorthand.
-            // In this instance, `yak` is the field being initalized.
+            // In this instance, `yak` is the field being initialized.
             error!(yak, error = error.as_ref(), "failed to shave yak");
         } else {
             yaks_shaved += 1;

tracing-appender/Cargo.toml

@@ -18,7 +18,7 @@ categories = [
 ]
 keywords = ["logging", "tracing", "file-appender", "non-blocking-writer"]
 edition = "2018"
-rust = "1.51.0"
+rust-version = "1.51.0"
 
 [dependencies]
 crossbeam-channel = "0.5.0"

tracing-appender/src/inner.rs

@@ -76,7 +76,7 @@ impl InnerAppender {
     }
 
     fn should_rollover(&self, date: OffsetDateTime) -> bool {
-        // the `None` case means that the `InnerAppender` *never* rorates log files.
+        // the `None` case means that the `InnerAppender` *never* rotates log files.
         match self.next_date {
             None => false,
             Some(next_date) => date >= next_date,

tracing-attributes/Cargo.toml

@@ -28,7 +28,7 @@ keywords = ["logging", "tracing", "macro", "instrument", "log"]
 license = "MIT"
 readme = "README.md"
 edition = "2018"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [lib]
 proc-macro = true

tracing-core/Cargo.toml

@@ -24,7 +24,7 @@ categories = [
 ]
 keywords = ["logging", "tracing", "profiling"]
 edition = "2018"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["std"]

tracing-core/src/callsite.rs

@@ -67,6 +67,7 @@ pub use self::inner::{rebuild_interest_cache, register};
 #[cfg(feature = "std")]
 mod inner {
     use super::*;
+    use lazy_static::lazy_static;
     use std::sync::RwLock;
     use std::vec::Vec;
 

tracing-core/src/collect.rs

@@ -239,8 +239,7 @@ pub trait Collect: 'static {
     /// but values for them won't be recorded at this time.
     ///
     /// ```rust,ignore
-    /// #[macro_use]
-    /// extern crate tracing;
+    /// # use tracing::span;
     ///
     /// let mut span = span!("my_span", foo = 3, bar, baz);
     ///

tracing-core/src/lib.rs

@@ -274,11 +274,6 @@ macro_rules! metadata {
     };
 }
 
-// std uses lazy_static from crates.io
-#[cfg(feature = "std")]
-#[macro_use]
-extern crate lazy_static;
-
 // Facade module: `no_std` uses spinlocks, `std` uses the mutexes in the standard library
 #[cfg(not(feature = "std"))]
 #[doc(hidden)]

tracing-error/Cargo.toml

@@ -32,7 +32,7 @@ keywords = [
     "backtrace"
 ]
 edition = "2018"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["traced-error"]

tracing-flame/Cargo.toml

@@ -19,7 +19,7 @@ categories = [
     "asynchronous",
 ]
 keywords = ["tracing", "subscriber", "flamegraph", "profiling"]
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["smallvec"]

tracing-futures/Cargo.toml

@@ -16,7 +16,7 @@ categories = [
 ]
 keywords = ["logging", "profiling", "tracing", "futures", "async"]
 license = "MIT"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["std-future", "std"]

tracing-journald/Cargo.toml

@@ -13,7 +13,7 @@ categories = [
     "development-tools::profiling",
 ]
 keywords = ["tracing", "journald"]
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [dependencies]
 tracing-core = { path = "../tracing-core", version = "0.2" }

tracing-log/Cargo.toml

@@ -15,7 +15,7 @@ categories = [
 keywords = ["logging", "tracing", "log"]
 license = "MIT"
 readme = "README.md"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["log-tracer", "std"]

tracing-macros/Cargo.toml

@@ -15,7 +15,7 @@ categories = [
 ]
 keywords = ["logging", "tracing"]
 license = "MIT"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [dependencies]
 tracing = { path = "../tracing", version = "0.2", default-features = false, features = ["std"] }

tracing-opentelemetry/Cargo.toml

@@ -17,7 +17,7 @@ categories = [
 keywords = ["tracing", "opentelemetry", "jaeger", "zipkin", "async"]
 license = "MIT"
 edition = "2018"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["tracing-log"]

tracing-serde/Cargo.toml

@@ -16,7 +16,7 @@ categories = [
     "encoding",
 ]
 keywords = ["logging", "tracing", "serialization"]
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["std"]

tracing-serde/README.md

@@ -53,10 +53,6 @@ tracing-serde = "0.1"
 Next, add this to your crate:
 
 ```rust
-#[macro_use]
-extern crate tracing;
-extern crate tracing_serde;
-
 use tracing_serde::AsSerde;
 ```
 

tracing-subscriber/Cargo.toml

@@ -20,7 +20,7 @@ categories = [
     "asynchronous",
 ]
 keywords = ["logging", "tracing", "metrics", "subscriber"]
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 

tracing-tower/Cargo.toml

@@ -15,7 +15,7 @@ categories = [
 ]
 keywords = ["logging", "tracing"]
 license = "MIT"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [features]
 default = ["tower-layer", "tower-make"]

tracing/Cargo.toml

@@ -28,7 +28,7 @@ categories = [
 ]
 keywords = ["logging", "tracing", "metrics", "async"]
 edition = "2018"
-rust = "1.42.0"
+rust-version = "1.42.0"
 
 [dependencies]
 tracing-core = { path = "../tracing-core", version = "0.2", default-features = false }

tracing/README.md

@@ -144,7 +144,7 @@ use std::{error::Error, io};
 use tracing::{debug, error, info, span, warn, Level};
 
 // the `#[tracing::instrument]` attribute creates and enters a span
-// every time the instrumented function is called. The span is named after the
+// every time the instrumented function is called. The span is named after
 // the function or method. Paramaters passed to the function are recorded as fields.
 #[tracing::instrument]
 pub fn shave(yak: usize) -> Result<(), Box<dyn Error + 'static>> {

tracing/benches/global_subscriber.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate tracing;
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use tracing::Level;
 

tracing/benches/subscriber.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate tracing;
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use tracing::Level;
 

tracing/src/level_filters.rs

@@ -65,7 +65,7 @@ pub use tracing_core::{metadata::ParseLevelFilterError, LevelFilter};
 /// [module-level documentation]: self#compile-time-filters
 pub const STATIC_MAX_LEVEL: LevelFilter = MAX_LEVEL;
 
-cfg_if! {
+cfg_if::cfg_if! {
     if #[cfg(all(not(debug_assertions), feature = "release_max_level_off"))] {
         const MAX_LEVEL: LevelFilter = LevelFilter::OFF;
     } else if #[cfg(all(not(debug_assertions), feature = "release_max_level_error"))] {

tracing/src/lib.rs

@@ -482,7 +482,7 @@
 //! use tracing::{debug, error, info, span, warn, Level};
 //!
 //! // the `#[tracing::instrument]` attribute creates and enters a span
-//! // every time the instrumented function is called. The span is named after the
+//! // every time the instrumented function is called. The span is named after
 //! // the function or method. Parameters passed to the function are recorded as fields.
 //! #[tracing::instrument]
 //! pub fn shave(yak: usize) -> Result<(), Box<dyn Error + 'static>> {
@@ -524,7 +524,7 @@
 //!
 //!         if let Err(ref error) = res {
 //!             // Like spans, events can also use the field initialization shorthand.
-//!             // In this instance, `yak` is the field being initalized.
+//!             // In this instance, `yak` is the field being initialized.
 //!             error!(yak, error = error.as_ref(), "failed to shave yak!");
 //!         } else {
 //!             yaks_shaved += 1;
@@ -929,9 +929,6 @@
     while_true
 )]
 
-#[macro_use]
-extern crate cfg_if;
-
 #[cfg(feature = "log")]
 #[doc(hidden)]
 pub use log;

tracing/src/span.rs

@@ -915,7 +915,7 @@ impl Span {
     /// ```
     ///
     /// If the current [collector] enables the [`DEBUG`] level, then both
-    /// the "parent" and "child" spans will be enabled. Thus, when the "spawaned
+    /// the "parent" and "child" spans will be enabled. Thus, when the "spawned
     /// a thread!" event occurs, it will be inside of the "child" span. Because
     /// "parent" is the parent of "child", the event will _also_ be inside of
     /// "parent".

tracing/test-log-support/src/lib.rs

@@ -1,4 +1,3 @@
-extern crate log;
 use log::{LevelFilter, Log, Metadata, Record};
 use std::sync::{Arc, Mutex};
 

tracing/test-log-support/tests/log_no_trace.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate tracing;
-extern crate test_log_support;
-
 use test_log_support::Test;
-use tracing::Level;
+use tracing::{error, info, span, trace, warn, Level};
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]

tracing/test-log-support/tests/log_with_trace.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate tracing;
-extern crate test_log_support;
-
 use test_log_support::Test;
-use tracing::Level;
+use tracing::{error, info, span, trace, warn, Level};
 use tracing_core::span::Current;
 
 pub struct NopCollector;

tracing/test-log-support/tests/span_activity_filtered_separately.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate tracing;
-extern crate test_log_support;
-
 use test_log_support::Test;
-use tracing::Level;
+use tracing::{error, info, span, trace, warn, Level};
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]

tracing/test-log-support/tests/span_lifecycle_can_be_enabled.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate tracing;
-extern crate test_log_support;
-
 use test_log_support::Test;
-use tracing::Level;
+use tracing::{error, info, span, trace, warn, Level};
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]

tracing/test-log-support/tests/span_lifecycle_defaults_off.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate tracing;
-extern crate test_log_support;
-
 use test_log_support::Test;
-use tracing::Level;
+use tracing::{error, info, span, trace, warn, Level};
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]

tracing/test-log-support/tests/span_lifecycle_is_trace.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate tracing;
-extern crate test_log_support;
-
 use test_log_support::Test;
-use tracing::Level;
+use tracing::{error, info, span, trace, warn, Level};
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]

tracing/test_static_max_level_features/tests/test.rs

@@ -1,9 +1,6 @@
-#[macro_use]
-extern crate tracing;
-
 use std::sync::{Arc, Mutex};
 use tracing::span::{Attributes, Record};
-use tracing::{span, Collect, Event, Id, Level, Metadata};
+use tracing::{debug, error, info, span, trace, warn, Collect, Event, Id, Level, Metadata};
 use tracing_core::span::Current;
 
 struct State {