ALPHA: wire is a tool to deploy nixos systems
wire.althaea.zone/
[autofix.ci] apply automated fixes
authored by
autofix-ci[bot]
and committed by
marshmallow
67d8f0dd
2fae286d
+14
-17
+12
-13
wire/lib/src/commands/common.rs
+12
-13
wire/lib/src/commands/common.rs
···
9
9
use crate::{
10
10
EvalGoal, SubCommandModifiers,
11
11
commands::{
12
-
ChildOutputMode, CommandArguments, Either, WireCommandChip, run_command, run_command_with_env
12
+
ChildOutputMode, CommandArguments, Either, WireCommandChip, run_command,
13
+
run_command_with_env,
13
14
},
14
15
errors::HiveLibError,
15
16
hive::{
···
102
103
},
103
104
);
104
105
105
-
let child = run_command(
106
-
&CommandArguments {
107
-
target: None,
108
-
output_mode: ChildOutputMode::Nix,
109
-
modifiers,
110
-
command_string,
111
-
keep_stdin_open: false,
112
-
elevated: false,
113
-
clobber_lock,
114
-
}
115
-
)?;
106
+
let child = run_command(&CommandArguments {
107
+
target: None,
108
+
output_mode: ChildOutputMode::Nix,
109
+
modifiers,
110
+
command_string,
111
+
keep_stdin_open: false,
112
+
elevated: false,
113
+
clobber_lock,
114
+
})?;
116
115
117
116
child
118
117
.wait_till_success()
119
118
.await
120
119
.map_err(|source| HiveLibError::NixEvalError { attribute, source })
121
120
.map(|x| match x {
122
-
Either::Left((_, stdout)) | Either::Right((_, stdout)) => stdout
121
+
Either::Left((_, stdout)) | Either::Right((_, stdout)) => stdout,
123
122
})
124
123
}
+2
-4
wire/lib/src/hive/steps/build.rs
+2
-4
wire/lib/src/hive/steps/build.rs
···
7
7
8
8
use crate::{
9
9
HiveLibError,
10
-
commands::{
11
-
ChildOutputMode, CommandArguments, Either, WireCommandChip, run_command_with_env
12
-
},
10
+
commands::{ChildOutputMode, CommandArguments, Either, WireCommandChip, run_command_with_env},
13
11
hive::node::{Context, ExecuteStep, Goal},
14
12
};
15
13
···
60
58
})?;
61
59
62
60
let stdout = match status {
63
-
Either::Left((_, stdout)) | Either::Right((_, stdout)) => stdout
61
+
Either::Left((_, stdout)) | Either::Right((_, stdout)) => stdout,
64
62
};
65
63
66
64
info!("Built output: {stdout:?}");