Compare commits

..

No commits in common. 'epel9' and 'i10ce' have entirely different histories.
epel9 ... i10ce

8
.gitignore vendored

@ -1,7 +1 @@
/results_*/
/*.src.rpm
/async-std-1.9.0.crate
/async-std-1.10.0.crate
/async-std-1.11.0.crate
/async-std-1.12.0.crate
SOURCES/async-std-1.13.0.crate

@ -0,0 +1 @@
b32c6669b3d429cfae13e527be3e4ae3b5644545 SOURCES/async-std-1.13.0.crate

@ -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,79 @@
--- async-std-1.13.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ async-std-1.13.0/Cargo.toml 2024-09-15T15:49:39.901950+00:00
@@ -70,10 +70,6 @@
path = "examples/list-dir.rs"
[[example]]
-name = "logging"
-path = "examples/logging.rs"
-
-[[example]]
name = "print-file"
path = "examples/print-file.rs"
@@ -88,11 +84,6 @@
[[example]]
name = "stdin-timeout"
path = "examples/stdin-timeout.rs"
-
-[[example]]
-name = "surf-web"
-path = "examples/surf-web.rs"
-required-features = ["surf"]
[[example]]
name = "task-local"
@@ -209,7 +200,7 @@
optional = true
[dependencies.async-channel]
-version = "1.8.0"
+version = "2.2.0"
optional = true
[dependencies.async-lock]
@@ -229,13 +220,8 @@
version = "0.3.4"
optional = true
-[dependencies.kv-log-macro]
-version = "1.0.6"
-optional = true
-
[dependencies.log]
version = "0.4.8"
-features = ["kv_unstable"]
optional = true
[dependencies.memchr]
@@ -257,13 +243,6 @@
[dependencies.slab]
version = "0.4.2"
optional = true
-
-[dependencies.surf]
-version = "2.0.0"
-optional = true
-
-[dev-dependencies.femme]
-version = "2.1.1"
[dev-dependencies.futures]
version = "0.3.4"
@@ -288,7 +267,6 @@
"async-global-executor",
"async-io",
"futures-lite",
- "kv-log-macro",
"log",
"pin-project-lite",
]
@@ -310,8 +288,6 @@
"async-channel",
"async-lock",
]
-tokio02 = ["async-global-executor/tokio02"]
-tokio03 = ["async-global-executor/tokio03"]
tokio1 = ["async-global-executor/tokio"]
unstable = [
"std",

@ -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,28 +1,42 @@
# Generated by rust2rpm 21
## START: Set by rpmautospec
## (rpmautospec version 0.7.2)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 2;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
# Generated by rust2rpm 26
%bcond_without check
%global debug_package %{nil}
%global crate async-std
Name: rust-%{crate}
Version: 1.12.0
Name: rust-async-std
Version: 1.13.0
Release: %autorelease
Summary: Async version of the Rust standard library
# Upstream license specification: Apache-2.0/MIT
License: ASL 2.0 or MIT
License: Apache-2.0 OR MIT
URL: https://crates.io/crates/async-std
Source: %{crates_source}
# Initial patched metadata
# * drop windows-specific dependencies and features
# * drop WASM-specific dependencies and features
# * drop tokio 0.3 features
# Automatically generated patch to strip dependencies and normalize metadata
Patch: async-std-fix-metadata-auto.diff
# Manually created patch for downstream crate metadata changes
# * drop tokio v0.2 and v0.3 features
# * drop optional surf dependency
Patch0: async-std-fix-metadata.diff
# * 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)
Patch: async-std-fix-metadata.diff
# * fix building tests with Rust 1.78+
Patch: 0001-drop-deny-warnings-from-doctests.patch
# * drop tracing-level log statements that depend on kv-log-macro
Patch: 0002-Drop-tracing-level-log-statements-that-depend-on-kv-.patch
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging >= 21
BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Async version of the Rust standard library.}
@ -214,16 +228,16 @@ use the "futures-lite" feature of the "%{crate}" crate.
%files -n %{name}+futures-lite-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+kv-log-macro-devel
%package -n %{name}+io_safety-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+kv-log-macro-devel %{_description}
%description -n %{name}+io_safety-devel %{_description}
This package contains library source intended for building other packages which
use the "kv-log-macro" feature of the "%{crate}" crate.
use the "io_safety" feature of the "%{crate}" crate.
%files -n %{name}+kv-log-macro-devel
%files -n %{name}+io_safety-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+log-devel
@ -310,18 +324,6 @@ use the "std" feature of the "%{crate}" crate.
%files -n %{name}+std-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+tokio02-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+tokio02-devel %{_description}
This package contains library source intended for building other packages which
use the "tokio02" feature of the "%{crate}" crate.
%files -n %{name}+tokio02-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+tokio1-devel
Summary: %{summary}
BuildArch: noarch
@ -347,10 +349,12 @@ use the "unstable" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
# remove example that depends on the optional surf dependency
rm examples/surf-web.rs
%autosetup -n %{crate}-%{version} -p1
%cargo_prep
# * 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
%generate_buildrequires
%cargo_generate_buildrequires
@ -363,9 +367,61 @@ rm examples/surf-web.rs
%if %{with check}
%check
# skip one failing test (probably related to mock environment)
# * skip one failing test (probably related to mock environment)
%cargo_test -- -- --skip io_timeout_timedout
%endif
%changelog
%autochangelog
* Fri Dec 20 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.13.0-2
- Rebuilt for MSVSphere 10
## START: Generated by rpmautospec
* Sun Sep 15 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1.13.0-2
- Use the current major version of async-channel
* Sun Sep 15 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1.13.0-1
- Update to version 1.13.0; Fixes RHBZ#2310522
* Wed Aug 28 2024 Fabio Valentini <decathorpe@gmail.com> - 1.12.0-9
- Drop additional dependencies for unused tracing-level log statements
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue May 21 2024 Fabio Valentini <decathorpe@gmail.com> - 1.12.0-7
- Fix building tests with Rust 1.78+
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Aug 06 2023 Fabio Valentini <decathorpe@gmail.com> - 1.12.0-5
- Regenerate with rust2rpm v24
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jul 16 2022 Fabio Valentini <decathorpe@gmail.com> - 1.12.0-1
- Update to version 1.12.0; Fixes RHBZ#2098407
* Tue Mar 22 2022 Fabio Valentini <decathorpe@gmail.com> - 1.11.0-1
- Update to version 1.11.0; Fixes RHBZ#2066939
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Aug 28 2021 Fabio Valentini <decathorpe@gmail.com> - 1.10.0-1
- Update to version 1.10.0; Fixes RHBZ#1998173
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 28 2021 Fabio Valentini <decathorpe@gmail.com> - 1.9.0-1
- Initial package
## END: Generated by rpmautospec

@ -1,70 +0,0 @@
--- async-std-1.12.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ async-std-1.12.0/Cargo.toml 2022-07-16T10:34:51.714357+00:00
@@ -46,10 +46,6 @@
[[example]]
name = "tcp-ipv4-and-6-echo"
required-features = ["unstable"]
-
-[[example]]
-name = "surf-web"
-required-features = ["surf"]
[[test]]
name = "stream"
@@ -109,10 +105,6 @@
version = "0.4.2"
optional = true
-[dependencies.surf]
-version = "2.0.0"
-optional = true
-
[dev-dependencies.femme]
version = "2.1.1"
@@ -142,7 +134,6 @@
"kv-log-macro",
"log",
"pin-project-lite",
- "gloo-timers",
]
docs = [
"attributes",
@@ -158,13 +149,10 @@
"once_cell",
"pin-utils",
"slab",
- "wasm-bindgen-futures",
- "futures-channel",
"async-channel",
"async-lock",
]
tokio02 = ["async-global-executor/tokio02"]
-tokio03 = ["async-global-executor/tokio03"]
tokio1 = ["async-global-executor/tokio"]
unstable = [
"std",
@@ -188,23 +176,3 @@
[target."cfg(not(target_os = \"unknown\"))".dependencies.futures-lite]
version = "1.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.2.1"
-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"

@ -1,5 +0,0 @@
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 28 2021 Fabio Valentini <decathorpe@gmail.com> - 1.9.0-1
- Initial package

@ -1 +0,0 @@
SHA512 (async-std-1.12.0.crate) = aaeef7f474fc700bba7beb6725d4eb778a9a05ebccfecdd81789b5d039c49508860d953f231c7b8fbce4c5b237d063a43eb03b83410490fc14eca572884f57e2
Loading…
Cancel
Save