Fix future clippy lints (#15519)

- suggestions for tersity using helpers
This commit is contained in:
Stefan Holderbach
2025-04-08 02:51:12 +02:00
committed by GitHub
parent a886e30e04
commit ecb9799b6a
5 changed files with 14 additions and 21 deletions

View File

@ -91,12 +91,12 @@ impl StackOutDest {
fn push_stdout(&mut self, stdout: OutDest) -> Option<OutDest> {
let stdout = mem::replace(&mut self.stdout, stdout);
mem::replace(&mut self.parent_stdout, Some(stdout))
self.parent_stdout.replace(stdout)
}
fn push_stderr(&mut self, stderr: OutDest) -> Option<OutDest> {
let stderr = mem::replace(&mut self.stderr, stderr);
mem::replace(&mut self.parent_stderr, Some(stderr))
self.parent_stderr.replace(stderr)
}
}
@ -118,13 +118,13 @@ impl<'a> StackIoGuard<'a> {
let (old_pipe_stdout, old_parent_stdout) = match stdout {
Some(Redirection::Pipe(stdout)) => {
let old = mem::replace(&mut out_dest.pipe_stdout, Some(stdout));
let old = out_dest.pipe_stdout.replace(stdout);
(old, out_dest.parent_stdout.take())
}
Some(Redirection::File(file)) => {
let file = OutDest::from(file);
(
mem::replace(&mut out_dest.pipe_stdout, Some(file.clone())),
out_dest.pipe_stdout.replace(file.clone()),
out_dest.push_stdout(file),
)
}
@ -133,7 +133,7 @@ impl<'a> StackIoGuard<'a> {
let (old_pipe_stderr, old_parent_stderr) = match stderr {
Some(Redirection::Pipe(stderr)) => {
let old = mem::replace(&mut out_dest.pipe_stderr, Some(stderr));
let old = out_dest.pipe_stderr.replace(stderr);
(old, out_dest.parent_stderr.take())
}
Some(Redirection::File(file)) => (
@ -192,7 +192,7 @@ pub struct StackCollectValueGuard<'a> {
impl<'a> StackCollectValueGuard<'a> {
pub(crate) fn new(stack: &'a mut Stack) -> Self {
let old_pipe_stdout = mem::replace(&mut stack.out_dest.pipe_stdout, Some(OutDest::Value));
let old_pipe_stdout = stack.out_dest.pipe_stdout.replace(OutDest::Value);
let old_pipe_stderr = stack.out_dest.pipe_stderr.take();
Self {
stack,
@ -233,7 +233,7 @@ pub struct StackCallArgGuard<'a> {
impl<'a> StackCallArgGuard<'a> {
pub(crate) fn new(stack: &'a mut Stack) -> Self {
let old_pipe_stdout = mem::replace(&mut stack.out_dest.pipe_stdout, Some(OutDest::Value));
let old_pipe_stdout = stack.out_dest.pipe_stdout.replace(OutDest::Value);
let old_pipe_stderr = stack.out_dest.pipe_stderr.take();
let old_stdout = stack