talexander/nix_builder
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Clean up RunningUpdate.

Browse Source
This commit is contained in:
Tom Alexander
2026-07-31 21:23:03 -04:00
parent 83f05b3677
commit 3aad35950e
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nix_util/running_update.rs
View File

@@ -1,5 +1,4 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::ops::Deref;
use std::time::Duration; use std::time::Duration;
use std::time::Instant; 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::output_stream::OutputStream;
use crate::nix_util::tree_iter::ForwardTreeIter; use crate::nix_util::tree_iter::ForwardTreeIter;
use super::activity::Activity;
use super::activity_tree::ActivityTreeEntry; use super::activity_tree::ActivityTreeEntry;
use super::activity_tree_stream::ActivityTreeStream; use super::activity_tree_stream::ActivityTreeStream;
use super::nix_output_stream::ActivityResultMessage; use super::nix_output_stream::ActivityResultMessage;
@@ -49,7 +47,7 @@ impl RunningUpdate {
} }
let exit_status = exit_status_handle.await?; let exit_status = exit_status_handle.await?;
println!("nix build status was: {}", exit_status); println!("nix update status was: {}", exit_status);
Ok(()) Ok(())
} }
@@ -171,25 +169,8 @@ fn is_match_predicate(entry: &ActivityTreeEntry) -> bool {
entry.get_activity().get_progress_text().is_some() 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; 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 { fn is_alive_predicate(entry: &ActivityTreeEntry) -> bool {