From c450f442cb9271c4ccdba48435674f47b01bfb2b Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 9 Feb 2024 15:38:28 +1000 Subject: [PATCH] Refactor: Move simple-git into a new repo (#1611) Moved to https://github.com/cargo-bins/simple-git Signed-off-by: Jiahao XU --- .github/workflows/release-pr.yml | 1 - Cargo.toml | 1 - crates/binstalk-registry/Cargo.toml | 2 +- crates/binstalk/Cargo.toml | 2 +- crates/simple-git/Cargo.toml | 38 ----- crates/simple-git/LICENSE-APACHE | 176 -------------------- crates/simple-git/LICENSE-MIT | 23 --- crates/simple-git/src/cancellation_token.rs | 44 ----- crates/simple-git/src/error.rs | 67 -------- crates/simple-git/src/lib.rs | 137 --------------- crates/simple-git/src/progress_tracing.rs | 156 ----------------- 11 files changed, 2 insertions(+), 645 deletions(-) delete mode 100644 crates/simple-git/Cargo.toml delete mode 100644 crates/simple-git/LICENSE-APACHE delete mode 100644 crates/simple-git/LICENSE-MIT delete mode 100644 crates/simple-git/src/cancellation_token.rs delete mode 100644 crates/simple-git/src/error.rs delete mode 100644 crates/simple-git/src/lib.rs delete mode 100644 crates/simple-git/src/progress_tracing.rs diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index 9518882a3..8bfefdfc6 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -23,7 +23,6 @@ on: - normalize-path - leon - leon-macros - - simple-git version: description: Version to release required: true diff --git a/Cargo.toml b/Cargo.toml index 7ea291db0..6df9c1c03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,6 @@ members = [ "crates/detect-wasi", "crates/fs-lock", "crates/normalize-path", - "crates/simple-git", "crates/detect-targets", "crates/leon", "crates/leon-macros", diff --git a/crates/binstalk-registry/Cargo.toml b/crates/binstalk-registry/Cargo.toml index 5334c52ec..53b1bc1d3 100644 --- a/crates/binstalk-registry/Cargo.toml +++ b/crates/binstalk-registry/Cargo.toml @@ -25,7 +25,7 @@ semver = { version = "1.0.17", features = ["serde"] } serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.107" sha2 = "0.10.7" -simple-git = { version = "0.2.2", path = "../simple-git", optional = true } +simple-git = { version = "0.2.2", optional = true } tempfile = "3.5.0" thiserror = "1.0.52" tokio = { version = "1.35.0", features = ["rt", "sync"], default-features = false } diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 2c67bda63..423fd402c 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -26,7 +26,7 @@ leon = { version = "2.0.1", path = "../leon" } maybe-owned = "0.3.4" miette = "5.9.0" semver = { version = "1.0.17", features = ["serde"] } -simple-git = { version = "0.2.2", path = "../simple-git", optional = true } +simple-git = { version = "0.2.2", optional = true } strum = "0.26.1" target-lexicon = { version = "0.12.11", features = ["std"] } tempfile = "3.5.0" diff --git a/crates/simple-git/Cargo.toml b/crates/simple-git/Cargo.toml deleted file mode 100644 index 6bcf93a24..000000000 --- a/crates/simple-git/Cargo.toml +++ /dev/null @@ -1,38 +0,0 @@ -[package] -name = "simple-git" -version = "0.2.2" -edition = "2021" - -description = "The simple git interface for gix suitable for async context (with tokio)" -repository = "https://github.com/cargo-bins/cargo-binstall" -documentation = "https://docs.rs/simple-git" -rust-version = "1.65.0" -authors = ["Jiahao XU "] -license = "Apache-2.0 OR MIT" - -[dependencies] -compact_str = "0.7.0" -derive_destructure2 = "0.1" -thiserror = "1.0.52" -tokio = { version = "1.35.0", features = ["rt", "time"], default-features = false } -tracing = "0.1.39" - -[dependencies.gix] -version = "0.58.0" -default-features = false -features = [ - "comfort", - "blocking-http-transport-reqwest", - "max-performance-safe", - "worktree-mutation", -] - -[features] -rustls = [ - "gix/blocking-http-transport-reqwest-rust-tls", -] -native-tls = [ - "gix/blocking-http-transport-reqwest-native-tls", -] - -git-max-perf = ["gix/max-performance"] diff --git a/crates/simple-git/LICENSE-APACHE b/crates/simple-git/LICENSE-APACHE deleted file mode 100644 index 1b5ec8b78..000000000 --- a/crates/simple-git/LICENSE-APACHE +++ /dev/null @@ -1,176 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS diff --git a/crates/simple-git/LICENSE-MIT b/crates/simple-git/LICENSE-MIT deleted file mode 100644 index 31aa79387..000000000 --- a/crates/simple-git/LICENSE-MIT +++ /dev/null @@ -1,23 +0,0 @@ -Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without -limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice -shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/crates/simple-git/src/cancellation_token.rs b/crates/simple-git/src/cancellation_token.rs deleted file mode 100644 index 97e65e52e..000000000 --- a/crates/simple-git/src/cancellation_token.rs +++ /dev/null @@ -1,44 +0,0 @@ -use std::sync::{ - atomic::{AtomicBool, Ordering::Relaxed}, - Arc, -}; - -use derive_destructure2::destructure; - -/// Token that can be used to cancel git operation. -#[derive(Clone, Debug, Default)] -pub struct GitCancellationToken(Arc); - -impl GitCancellationToken { - /// Create a guard that cancel the git operation on drop. - #[must_use = "You must assign the guard to a variable, \ -otherwise it is equivalent to `GitCancellationToken::cancel()`"] - pub fn cancel_on_drop(self) -> GitCancelOnDrop { - GitCancelOnDrop(self) - } - - /// Cancel the git operation. - pub fn cancel(&self) { - self.0.store(true, Relaxed) - } - - pub(super) fn get_atomic(&self) -> &AtomicBool { - &self.0 - } -} - -/// Guard used to cancel git operation on drop -#[derive(Debug, destructure)] -pub struct GitCancelOnDrop(GitCancellationToken); - -impl Drop for GitCancelOnDrop { - fn drop(&mut self) { - self.0.cancel() - } -} -impl GitCancelOnDrop { - /// Disarm the guard, return the token. - pub fn disarm(self) -> GitCancellationToken { - self.destructure().0 - } -} diff --git a/crates/simple-git/src/error.rs b/crates/simple-git/src/error.rs deleted file mode 100644 index 1aa6f17fc..000000000 --- a/crates/simple-git/src/error.rs +++ /dev/null @@ -1,67 +0,0 @@ -use gix::clone; -use thiserror::Error as ThisError; - -#[derive(Debug, ThisError)] -#[error(transparent)] -pub struct GitError(#[from] GitErrorInner); - -#[derive(Debug, ThisError)] -pub(super) enum GitErrorInner { - #[error("Failed to prepare for fetch: {0}")] - PrepareFetchError(#[source] Box), - - #[error("Failed to fetch: {0}")] - FetchError(#[source] Box), - - #[error("Failed to checkout: {0}")] - CheckOutError(#[source] Box), - - #[error("HEAD ref was corrupt in crates-io index repository clone")] - HeadCommit(#[source] Box), - - #[error("tree of head commit wasn't present in crates-io index repository clone")] - GetTreeOfCommit(#[source] Box), - - #[error("An object was missing in the crates-io index repository clone")] - ObjectLookup(#[source] Box), -} - -impl From for GitErrorInner { - fn from(e: clone::Error) -> Self { - Self::PrepareFetchError(Box::new(e)) - } -} - -impl From for GitErrorInner { - fn from(e: clone::fetch::Error) -> Self { - Self::FetchError(Box::new(e)) - } -} - -impl From for GitErrorInner { - fn from(e: clone::checkout::main_worktree::Error) -> Self { - Self::CheckOutError(Box::new(e)) - } -} - -impl From for GitErrorInner { - fn from(e: gix::reference::head_commit::Error) -> Self { - Self::HeadCommit(Box::new(e)) - } -} - -impl From for GitErrorInner { - fn from(e: gix::object::commit::Error) -> Self { - Self::GetTreeOfCommit(Box::new(e)) - } -} - -impl From for GitErrorInner { - fn from(e: gix::object::find::existing::Error) -> Self { - Self::ObjectLookup(Box::new(e)) - } -} - -#[derive(Debug, ThisError)] -#[error(transparent)] -pub struct GitUrlParseError(pub(super) gix::url::parse::Error); diff --git a/crates/simple-git/src/lib.rs b/crates/simple-git/src/lib.rs deleted file mode 100644 index 78a8c2bb9..000000000 --- a/crates/simple-git/src/lib.rs +++ /dev/null @@ -1,137 +0,0 @@ -use std::{fmt, mem, num::NonZeroU32, path::Path, str::FromStr, sync::atomic::AtomicBool}; - -use gix::{clone, create, open, remote, Url}; -use tracing::debug; - -mod progress_tracing; -use progress_tracing::TracingProgress; - -mod cancellation_token; -pub use cancellation_token::{GitCancelOnDrop, GitCancellationToken}; - -mod error; -use error::GitErrorInner; -pub use error::{GitError, GitUrlParseError}; - -#[derive(Clone, Debug)] -pub struct GitUrl(Url); - -impl fmt::Display for GitUrl { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - fmt::Display::fmt(&self.0, f) - } -} - -impl FromStr for GitUrl { - type Err = GitUrlParseError; - - fn from_str(s: &str) -> Result { - Url::try_from(s).map(Self).map_err(GitUrlParseError) - } -} - -#[derive(Debug)] -pub struct Repository(gix::ThreadSafeRepository); - -impl Repository { - fn prepare_fetch( - url: GitUrl, - path: &Path, - kind: create::Kind, - ) -> Result { - Ok(clone::PrepareFetch::new( - url.0, - path, - kind, - create::Options { - destination_must_be_empty: true, - ..Default::default() - }, - open::Options::isolated(), - )? - .with_shallow(remote::fetch::Shallow::DepthAtRemote( - NonZeroU32::new(1).unwrap(), - ))) - } - - /// WARNING: This is a blocking operation, if you want to use it in - /// async context then you must wrap the call in [`tokio::task::spawn_blocking`]. - /// - /// WARNING: This function must be called after tokio runtime is initialized. - pub fn shallow_clone_bare( - url: GitUrl, - path: &Path, - cancellation_token: Option, - ) -> Result { - debug!("Shallow cloning {url} to {}", path.display()); - - Ok(Self( - Self::prepare_fetch(url, path, create::Kind::Bare)? - .fetch_only( - &mut TracingProgress::new("Cloning bare"), - cancellation_token - .as_ref() - .map(GitCancellationToken::get_atomic) - .unwrap_or(&AtomicBool::new(false)), - ) - .map_err(GitErrorInner::from)? - .0 - .into(), - )) - } - - /// WARNING: This is a blocking operation, if you want to use it in - /// async context then you must wrap the call in [`tokio::task::spawn_blocking`]. - /// - /// WARNING: This function must be called after tokio runtime is initialized. - pub fn shallow_clone( - url: GitUrl, - path: &Path, - cancellation_token: Option, - ) -> Result { - debug!("Shallow cloning {url} to {} with worktree", path.display()); - - let mut progress = TracingProgress::new("Cloning with worktree"); - - Ok(Self( - Self::prepare_fetch(url, path, create::Kind::WithWorktree)? - .fetch_then_checkout(&mut progress, &AtomicBool::new(false)) - .map_err(GitErrorInner::from)? - .0 - .main_worktree( - &mut progress, - cancellation_token - .as_ref() - .map(GitCancellationToken::get_atomic) - .unwrap_or(&AtomicBool::new(false)), - ) - .map_err(GitErrorInner::from)? - .0 - .into(), - )) - } - - #[inline(always)] - pub fn get_head_commit_entry_data_by_path( - &self, - path: impl AsRef, - ) -> Result>, GitError> { - fn inner(this: &Repository, path: &Path) -> Result>, GitErrorInner> { - Ok( - if let Some(entry) = this - .0 - .to_thread_local() - .head_commit()? - .tree()? - .peel_to_entry_by_path(path)? - { - Some(mem::take(&mut entry.object()?.data)) - } else { - None - }, - ) - } - - Ok(inner(self, path.as_ref())?) - } -} diff --git a/crates/simple-git/src/progress_tracing.rs b/crates/simple-git/src/progress_tracing.rs deleted file mode 100644 index 5ffc9dfe7..000000000 --- a/crates/simple-git/src/progress_tracing.rs +++ /dev/null @@ -1,156 +0,0 @@ -use std::{ - sync::{ - atomic::{AtomicBool, Ordering}, - Arc, - }, - time::Duration, -}; - -use compact_str::{format_compact, CompactString}; -use gix::progress::{ - prodash::messages::MessageLevel, Count, Id, NestedProgress, Progress, Step, StepShared, Unit, - UNKNOWN, -}; -use tokio::time; -use tracing::{error, info}; - -pub(super) struct TracingProgress { - name: CompactString, - id: Id, - max: Option, - unit: Option, - step: StepShared, - trigger: Arc, -} - -const EMIT_LOG_EVERY_S: f32 = 0.5; -const SEP: &str = "::"; - -impl TracingProgress { - /// Create a new instanCompactce from `name`. - pub fn new(name: &str) -> Self { - let trigger = Arc::new(AtomicBool::new(true)); - tokio::spawn({ - let mut interval = time::interval(Duration::from_secs_f32(EMIT_LOG_EVERY_S)); - interval.set_missed_tick_behavior(time::MissedTickBehavior::Skip); - - let trigger = Arc::clone(&trigger); - async move { - while Arc::strong_count(&trigger) > 1 { - trigger.store(true, Ordering::Relaxed); - - interval.tick().await; - } - } - }); - Self { - name: CompactString::new(name), - id: UNKNOWN, - max: None, - step: Default::default(), - unit: None, - trigger, - } - } - - fn log_progress(&self, step: Step) { - if self.trigger.swap(false, Ordering::Relaxed) { - match (self.max, &self.unit) { - (max, Some(unit)) => { - info!("{} → {}", self.name, unit.display(step, max, None)) - } - (Some(max), None) => info!("{} → {} / {}", self.name, step, max), - (None, None) => info!("{} → {}", self.name, step), - } - } - } -} - -impl Count for TracingProgress { - fn set(&self, step: Step) { - self.step.store(step, Ordering::Relaxed); - self.log_progress(step); - } - - fn step(&self) -> Step { - self.step.load(Ordering::Relaxed) - } - - fn inc_by(&self, step_to_inc: Step) { - self.log_progress( - self.step - .fetch_add(step_to_inc, Ordering::Relaxed) - .wrapping_add(step_to_inc), - ); - } - - fn counter(&self) -> StepShared { - Arc::clone(&self.step) - } -} - -impl Progress for TracingProgress { - fn init(&mut self, max: Option, unit: Option) { - self.max = max; - self.unit = unit; - } - - fn unit(&self) -> Option { - self.unit.clone() - } - - fn max(&self) -> Option { - self.max - } - - fn set_max(&mut self, max: Option) -> Option { - let prev = self.max; - self.max = max; - prev - } - - fn set_name(&mut self, name: String) { - self.name = self - .name - .split("::") - .next() - .map(|parent| format_compact!("{parent}{SEP}{name}")) - .unwrap_or_else(|| name.into()); - } - - fn name(&self) -> Option { - self.name.split(SEP).nth(1).map(ToOwned::to_owned) - } - - fn id(&self) -> Id { - self.id - } - - fn message(&self, level: MessageLevel, message: String) { - let name = &self.name; - match level { - MessageLevel::Info => info!("ℹ{name} → {message}"), - MessageLevel::Failure => error!("𐄂{name} → {message}"), - MessageLevel::Success => info!("✓{name} → {message}"), - } - } -} - -impl NestedProgress for TracingProgress { - type SubProgress = TracingProgress; - - fn add_child(&mut self, name: impl Into) -> Self::SubProgress { - self.add_child_with_id(name, UNKNOWN) - } - - fn add_child_with_id(&mut self, name: impl Into, id: Id) -> Self::SubProgress { - Self { - name: format_compact!("{}{}{}", self.name, SEP, Into::::into(name)), - id, - step: Arc::default(), - max: None, - unit: None, - trigger: Arc::clone(&self.trigger), - } - } -}