Skip to content

Commit

Permalink
Use clone_from
Browse files Browse the repository at this point in the history
  • Loading branch information
magicant committed May 9, 2024
1 parent cf901bd commit b939514
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion yash-builtin/src/fg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ mod tests {
let mut job = Job::new(pid);
job.job_controlled = true;
job.state = subshell_state;
job.name = "my job name".to_owned();
"my job name".clone_into(&mut job.name);
let index = env.jobs.add(job);

resume_job_by_index(&mut env, index).await.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion yash-cli/src/startup/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ where
} else {
// No -c or -s
if let Some(operand) = args.next_if(|_| true) {
result.arg0 = operand.clone();
result.arg0.clone_from(&operand);
result.source = Source::File { path: operand };
}
}
Expand Down
2 changes: 1 addition & 1 deletion yash-env/src/system/virtual/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl Process {
pub fn fork_from(ppid: Pid, parent: &Process) -> Process {
let mut child = Self::with_parent_and_group(ppid, parent.pgid);
child.fds = parent.fds.clone();
child.signal_handlings = parent.signal_handlings.clone();
child.signal_handlings.clone_from(&parent.signal_handlings);
child.blocked_signals = parent.blocked_signals;
child.pending_signals = SigSet::empty();
child
Expand Down
10 changes: 8 additions & 2 deletions yash-semantics/src/expansion/initial/param/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ mod tests {
assert_eq!(result, Expansion::Array([].as_slice().into()));

let params = vec!["a".to_string(), "foo bar".to_string(), "9".to_string()];
env.variables.positional_params_mut().values = params.clone();
env.variables
.positional_params_mut()
.values
.clone_from(&params);
let result = resolve(Name::Special('@'), &env, &loc);
assert_eq!(result, Expansion::Array(params.into()));
}
Expand All @@ -137,7 +140,10 @@ mod tests {
assert_eq!(result, Expansion::Array([].as_slice().into()));

let params = vec!["a".to_string(), "foo bar".to_string(), "9".to_string()];
env.variables.positional_params_mut().values = params.clone();
env.variables
.positional_params_mut()
.values
.clone_from(&params);
let result = resolve(Name::Special('*'), &env, &loc);
assert_eq!(result, Expansion::Array(params.into()));
}
Expand Down

0 comments on commit b939514

Please sign in to comment.