ALPHA: wire is a tool to deploy nixos systems wire.althaea.zone/
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

[autofix.ci] apply automated fixes

authored by

autofix-ci[bot] and committed by
GitHub
f6f1f486 bf899e66

+26 -19
-1
wire/lib/src/commands/common.rs
··· 6 6 sync::{Arc, Mutex}, 7 7 }; 8 8 9 - 10 9 use crate::{ 11 10 EvalGoal, SubCommandModifiers, 12 11 commands::{CommandArguments, Either, WireCommandChip, run_command, run_command_with_env},
+20 -14
wire/lib/src/commands/noninteractive.rs
··· 89 89 let mut joinset = JoinSet::new(); 90 90 let output_mode = Arc::new(arguments.output_mode); 91 91 92 - joinset.spawn(handle_io( 93 - stderr_handle, 94 - output_mode.clone(), 95 - error_collection.clone(), 96 - true, 97 - true, 98 - ).in_current_span()); 99 - joinset.spawn(handle_io( 100 - stdout_handle, 101 - output_mode.clone(), 102 - stdout_collection.clone(), 103 - false, 104 - arguments.log_stdout, 105 - ).in_current_span()); 92 + joinset.spawn( 93 + handle_io( 94 + stderr_handle, 95 + output_mode.clone(), 96 + error_collection.clone(), 97 + true, 98 + true, 99 + ) 100 + .in_current_span(), 101 + ); 102 + joinset.spawn( 103 + handle_io( 104 + stdout_handle, 105 + output_mode.clone(), 106 + stdout_collection.clone(), 107 + false, 108 + arguments.log_stdout, 109 + ) 110 + .in_current_span(), 111 + ); 106 112 107 113 Ok(NonInteractiveChildChip { 108 114 error_collection,
+6 -4
wire/lib/src/nix_log.rs
··· 38 38 VerbosityLevel::Warn | VerbosityLevel::Notice => tracing_level::WARN, 39 39 VerbosityLevel::Error => tracing_level::ERROR, 40 40 VerbosityLevel::Debug => tracing_level::DEBUG, 41 - VerbosityLevel::Vomit | VerbosityLevel::Talkative | VerbosityLevel::Chatty => tracing_level::TRACE, 41 + VerbosityLevel::Vomit | VerbosityLevel::Talkative | VerbosityLevel::Chatty => { 42 + tracing_level::TRACE 43 + } 42 44 } 43 45 } 44 46 ··· 60 62 tracing_level::DEBUG => event!(tracing_level::DEBUG, "{msg}"), 61 63 tracing_level::TRACE => event!(tracing_level::TRACE, "{msg}"), 62 64 } 63 - }, 65 + } 64 66 LogMessage::Start { text, level, .. } => { 65 67 if text.is_empty() { 66 68 return; ··· 73 75 tracing_level::DEBUG => event!(tracing_level::DEBUG, "{text}"), 74 76 tracing_level::TRACE => event!(tracing_level::TRACE, "{text}"), 75 77 } 76 - }, 78 + } 77 79 LogMessage::SetPhase { phase } => { 78 80 if phase.is_empty() { 79 81 return; 80 82 } 81 83 82 84 event!(tracing_level::INFO, set_phase = phase); 83 - }, 85 + } 84 86 _ => {} 85 87 } 86 88 }