itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify line splitting code in exec_with_streaming NFC

Browse Source
This commit is contained in:
Tomasz Miąsko 2021-06-17 00:00:00 +00:00
parent af6d540a70
commit 9f60fcacaf
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
crates/cargo-util/src/process_builder.rs
View File

@ -256,34 +256,30 @@ impl ProcessBuilder {
None => return,
}
};
{
// scope for new_lines
let new_lines = if capture_output {
let dst = if is_out { &mut stdout } else { &mut stderr };
let start = dst.len();
let data = data.drain(..idx);
dst.extend(data);
&dst[start..]
let new_lines = &data[..idx];
for line in String::from_utf8_lossy(new_lines).lines() {
if callback_error.is_some() {
break;
}
let callback_result = if is_out {
on_stdout_line(line)
} else {
&data[..idx]
on_stderr_line(line)
};
for line in String::from_utf8_lossy(new_lines).lines() {
if callback_error.is_some() {
break;
}
let callback_result = if is_out {
on_stdout_line(line)
} else {
on_stderr_line(line)
};
if let Err(e) = callback_result {
callback_error = Some(e);
}
if let Err(e) = callback_result {
callback_error = Some(e);
break;
}
}
if !capture_output {
data.drain(..idx);
if capture_output {
let dst = if is_out { &mut stdout } else { &mut stderr };
dst.extend(new_lines);
}
data.drain(..idx);
})?;
child.wait()
})()