Skip to content

Commit

Permalink
tracing: fix issues compiling for WASM/other <=32-bit platforms (#2060)
Browse files Browse the repository at this point in the history
This changes the "unregistered" interest state from `0xDEADFACED`
to`0xDEAD`, which should fit in a `usize` even on 16-bit platforms. The
actual value of this thing doesn't matter at all, it just has to be "not
0, 1, or 2", and it's good for it to be something weird to make it more
obvious in the event of stuff going wrong.

This should fix a warning being emitted when building for wasm (and
other <=32-bit platforms) because the previous literal would be
truncated.

Also, the `wasm_bindgen_test` macro apparently messes with the 
`macros_redefined_core` tests, so skip them on wasm.
  • Loading branch information
hawkw committed Apr 8, 2022
1 parent 8f240e6 commit 38da7ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion tracing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
Expand Down
3 changes: 0 additions & 3 deletions tracing/tests/macros_redefined_core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 38da7ea

Please sign in to comment.