summaryrefslogtreecommitdiffstats
path: root/vendor/tokio/src/macros/mod.rs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:57:31 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:57:31 +0000
commitdc0db358abe19481e475e10c32149b53370f1a1c (patch)
treeab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/tokio/src/macros/mod.rs
parentReleasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff)
downloadrustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz
rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/tokio/src/macros/mod.rs')
-rw-r--r--vendor/tokio/src/macros/mod.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/tokio/src/macros/mod.rs b/vendor/tokio/src/macros/mod.rs
index b0af52152..82f42dbff 100644
--- a/vendor/tokio/src/macros/mod.rs
+++ b/vendor/tokio/src/macros/mod.rs
@@ -16,8 +16,12 @@ mod ready;
mod thread_local;
#[macro_use]
-#[cfg(feature = "rt")]
-pub(crate) mod scoped_tls;
+mod addr_of;
+
+cfg_trace! {
+ #[macro_use]
+ mod trace;
+}
cfg_macros! {
#[macro_use]