Compare commits
9 Commits
Author | SHA1 | Date |
---|---|---|
|
cd3e2588b5 | 5 months ago |
|
dead9a0ad4 | 5 months ago |
|
92fb446f00 | 6 months ago |
|
3ccf0115b2 | 7 months ago |
|
ce353a5ae0 | 9 months ago |
|
f0768f645c | 1 year ago |
|
cdf12c0a54 | 2 years ago |
|
bb64172127 | 2 years ago |
|
e7a3bd8c1e | 2 years ago |
@ -0,0 +1,25 @@
|
||||
From 464572d9eaafc802657529706ebf4872e33e83ad Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Tue, 21 May 2024 16:25:06 +0200
|
||||
Subject: [PATCH 1/2] drop deny(warnings) from doctests
|
||||
|
||||
---
|
||||
src/lib.rs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib.rs b/src/lib.rs
|
||||
index 86786e8..51d71ed 100644
|
||||
--- a/src/lib.rs
|
||||
+++ b/src/lib.rs
|
||||
@@ -280,7 +280,7 @@
|
||||
#![cfg_attr(feature = "docs", feature(doc_cfg))]
|
||||
#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
|
||||
#![allow(clippy::mutex_atomic, clippy::module_inception)]
|
||||
-#![doc(test(attr(deny(rust_2018_idioms, warnings))))]
|
||||
+#![doc(test(attr(deny(rust_2018_idioms))))]
|
||||
#![doc(test(attr(allow(unused_extern_crates, unused_variables))))]
|
||||
#![doc(html_logo_url = "https://async.rs/images/logo--hero.svg")]
|
||||
|
||||
--
|
||||
2.46.0
|
||||
|
@ -0,0 +1,92 @@
|
||||
From 8d9167b880dac3e4cafac486189e8b534f6b10d8 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Wed, 28 Aug 2024 10:18:33 +0200
|
||||
Subject: [PATCH 2/2] Drop tracing-level log statements that depend on
|
||||
kv-log-macro
|
||||
|
||||
---
|
||||
src/task/builder.rs | 40 ++++++++++++++++++++--------------------
|
||||
1 file changed, 20 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/src/task/builder.rs b/src/task/builder.rs
|
||||
index aba0d61..40c31ab 100644
|
||||
--- a/src/task/builder.rs
|
||||
+++ b/src/task/builder.rs
|
||||
@@ -54,10 +54,10 @@ impl Builder {
|
||||
{
|
||||
let wrapped = self.build(future);
|
||||
|
||||
- kv_log_macro::trace!("spawn", {
|
||||
- task_id: wrapped.tag.id().0,
|
||||
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
- });
|
||||
+ //kv_log_macro::trace!("spawn", {
|
||||
+ // task_id: wrapped.tag.id().0,
|
||||
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
+ //});
|
||||
|
||||
let task = wrapped.tag.task().clone();
|
||||
let handle = async_global_executor::spawn(wrapped);
|
||||
@@ -74,10 +74,10 @@ impl Builder {
|
||||
{
|
||||
let wrapped = self.build(future);
|
||||
|
||||
- kv_log_macro::trace!("spawn_local", {
|
||||
- task_id: wrapped.tag.id().0,
|
||||
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
- });
|
||||
+ //kv_log_macro::trace!("spawn_local", {
|
||||
+ // task_id: wrapped.tag.id().0,
|
||||
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
+ //});
|
||||
|
||||
let task = wrapped.tag.task().clone();
|
||||
let handle = async_global_executor::spawn_local(wrapped);
|
||||
@@ -99,10 +99,10 @@ impl Builder {
|
||||
let res = future.await;
|
||||
let _ = sender.send(res);
|
||||
});
|
||||
- kv_log_macro::trace!("spawn_local", {
|
||||
- task_id: wrapped.tag.id().0,
|
||||
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
- });
|
||||
+ //kv_log_macro::trace!("spawn_local", {
|
||||
+ // task_id: wrapped.tag.id().0,
|
||||
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
+ //});
|
||||
|
||||
let task = wrapped.tag.task().clone();
|
||||
wasm_bindgen_futures::spawn_local(wrapped);
|
||||
@@ -125,10 +125,10 @@ impl Builder {
|
||||
let _ = sender.send(res);
|
||||
});
|
||||
|
||||
- kv_log_macro::trace!("spawn_local", {
|
||||
- task_id: wrapped.tag.id().0,
|
||||
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
- });
|
||||
+ //kv_log_macro::trace!("spawn_local", {
|
||||
+ // task_id: wrapped.tag.id().0,
|
||||
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
+ //});
|
||||
|
||||
let task = wrapped.tag.task().clone();
|
||||
wasm_bindgen_futures::spawn_local(wrapped);
|
||||
@@ -147,10 +147,10 @@ impl Builder {
|
||||
let wrapped = self.build(future);
|
||||
|
||||
// Log this `block_on` operation.
|
||||
- kv_log_macro::trace!("block_on", {
|
||||
- task_id: wrapped.tag.id().0,
|
||||
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
- });
|
||||
+ //kv_log_macro::trace!("block_on", {
|
||||
+ // task_id: wrapped.tag.id().0,
|
||||
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||||
+ //});
|
||||
|
||||
thread_local! {
|
||||
/// Tracks the number of nested block_on calls.
|
||||
--
|
||||
2.46.0
|
||||
|
@ -0,0 +1,42 @@
|
||||
--- async-std-1.13.0/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ async-std-1.13.0/Cargo.toml 2024-09-15T15:47:53.182471+00:00
|
||||
@@ -291,7 +291,6 @@
|
||||
"kv-log-macro",
|
||||
"log",
|
||||
"pin-project-lite",
|
||||
- "gloo-timers",
|
||||
]
|
||||
docs = [
|
||||
"attributes",
|
||||
@@ -308,8 +307,6 @@
|
||||
"once_cell",
|
||||
"pin-utils",
|
||||
"slab",
|
||||
- "wasm-bindgen-futures",
|
||||
- "futures-channel",
|
||||
"async-channel",
|
||||
"async-lock",
|
||||
]
|
||||
@@ -339,22 +336,3 @@
|
||||
version = "2.0.0"
|
||||
optional = true
|
||||
|
||||
-[target.'cfg(target_arch = "wasm32")'.dependencies.futures-channel]
|
||||
-version = "0.3.4"
|
||||
-optional = true
|
||||
-
|
||||
-[target.'cfg(target_arch = "wasm32")'.dependencies.gloo-timers]
|
||||
-version = "0.3.0"
|
||||
-features = ["futures"]
|
||||
-optional = true
|
||||
-
|
||||
-[target.'cfg(target_arch = "wasm32")'.dependencies.wasm-bindgen-futures]
|
||||
-version = "0.4.10"
|
||||
-optional = true
|
||||
-
|
||||
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies.getrandom]
|
||||
-version = "0.2.0"
|
||||
-features = ["js"]
|
||||
-
|
||||
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies.wasm-bindgen-test]
|
||||
-version = "0.3.10"
|
@ -0,0 +1,20 @@
|
||||
[package]
|
||||
cargo-toml-patch-comments = [
|
||||
"drop tokio v0.2 and v0.3 features",
|
||||
"drop optional surf dependency",
|
||||
"drop additional dependencies for tracing-level log statements",
|
||||
"Use the current major version of async-channel (https://github.com/async-rs/async-std/pull/1092)",
|
||||
]
|
||||
|
||||
[scripts]
|
||||
prep.post = [
|
||||
"# * remove example that depends on the removed femme dev-dependency",
|
||||
"rm examples/logging.rs",
|
||||
"# remove example that depends on the removed optional surf dependency",
|
||||
"rm examples/surf-web.rs",
|
||||
]
|
||||
|
||||
[tests]
|
||||
skip = ["io_timeout_timedout"]
|
||||
comments = ["skip one failing test (probably related to mock environment)"]
|
||||
|
@ -1 +1 @@
|
||||
SHA512 (async-std-1.12.0.crate) = aaeef7f474fc700bba7beb6725d4eb778a9a05ebccfecdd81789b5d039c49508860d953f231c7b8fbce4c5b237d063a43eb03b83410490fc14eca572884f57e2
|
||||
SHA512 (async-std-1.13.0.crate) = 47d50f728b1d5f8d9510234833d0b2044ee6817e7a5920df58bffabb6fdd5b821c9645fc54303f8f270de06329f041385b11eec9ce3983eb5975870d99d5ca48
|
||||
|
Loading…
Reference in new issue