Skip to content

Commit

Permalink
Auto merge of #6829 - ehuss:fix-mutable-borrow, r=alexcrichton
Browse files Browse the repository at this point in the history
Fix mutable_borrow_reservation_conflict warning.

nightly-2019-04-08 added a more restrictive borrowing rule (rust-lang/rust#58739).
  • Loading branch information
bors committed Apr 8, 2019
2 parents f5b60ac + f9f339a commit 73036da
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/testsuite/support/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,8 @@ impl Execs {
pub fn cwd<T: AsRef<OsStr>>(&mut self, path: T) -> &mut Self {
if let Some(ref mut p) = self.process_builder {
if let Some(cwd) = p.get_cwd() {
p.cwd(cwd.join(path.as_ref()));
let new_path = cwd.join(path.as_ref());
p.cwd(new_path);
} else {
p.cwd(path);
}
Expand Down

0 comments on commit 73036da

Please sign in to comment.