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

tokio-rs · Apr 8, 2022 · b77cc60 · b77cc60
2 parents 14cc4de + 38da7ea
commit b77cc60
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/tracing/src/lib.rs b/tracing/src/lib.rs
@@ -1005,7 +1005,7 @@ pub mod __macro_support {
         /// without warning.
         pub const fn new(meta: &'static Metadata<'static>) -> Self {
             Self {
-                interest: AtomicUsize::new(0xDEADFACED),
+                interest: AtomicUsize::new(0xDEAD),
                 meta,
                 registration: Once::new(),
             }

diff --git a/tracing/tests/macros_redefined_core.rs b/tracing/tests/macros_redefined_core.rs
@@ -2,19 +2,16 @@ extern crate self as core;
 
 use tracing::{enabled, event, span, Level};
 
-#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]
 fn span() {
     span!(Level::DEBUG, "foo");
 }
 
-#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]
 fn event() {
     event!(Level::DEBUG, "foo");
 }
 
-#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]
 fn enabled() {
     enabled!(Level::DEBUG);