diff --git a/src/nix_util/running_update.rs b/src/nix_util/running_update.rs index 0b0711c..e076f65 100644 --- a/src/nix_util/running_update.rs +++ b/src/nix_util/running_update.rs @@ -1,5 +1,4 @@ use std::borrow::Cow; -use std::ops::Deref; use std::time::Duration; use std::time::Instant; @@ -12,7 +11,6 @@ use crate::nix_util::nix_output_stream::NixAction; use crate::nix_util::output_stream::OutputStream; use crate::nix_util::tree_iter::ForwardTreeIter; -use super::activity::Activity; use super::activity_tree::ActivityTreeEntry; use super::activity_tree_stream::ActivityTreeStream; use super::nix_output_stream::ActivityResultMessage; @@ -49,7 +47,7 @@ impl RunningUpdate { } let exit_status = exit_status_handle.await?; - println!("nix build status was: {}", exit_status); + println!("nix update status was: {}", exit_status); Ok(()) } @@ -171,25 +169,8 @@ fn is_match_predicate(entry: &ActivityTreeEntry) -> bool { entry.get_activity().get_progress_text().is_some() } -pub(crate) fn is_transparent_predicate(entry: &ActivityTreeEntry) -> bool { +fn is_transparent_predicate(entry: &ActivityTreeEntry) -> bool { return false; - // match entry.get_activity() { - // Activity::Root(_activity_root) => true, - // Activity::Unknown(_activity_unknown) => false, - // Activity::CopyPath(_activity_copy_path) => false, - // Activity::FileTransfer(_activity_file_transfer) => false, - // Activity::Realize(_activity_realize) => true, - // Activity::CopyPaths(_activity_copy_paths) => true, - // Activity::Builds(_activity_builds) => true, - // Activity::Build(_activity_build) => false, - // Activity::OptimizeStore(_activity_optimize_store) => false, - // Activity::VerifyPaths(_activity_verify_paths) => false, - // Activity::Substitute(_activity_substitute) => false, - // Activity::QueryPathInfo(_activity_query_path_info) => false, - // Activity::PostBuildHook(_activity_post_build_hook) => false, - // Activity::BuildWaiting(_activity_build_waiting) => true, - // Activity::FetchTree(_activity_fetch_tree) => false, - // } } fn is_alive_predicate(entry: &ActivityTreeEntry) -> bool {