From 2a4c0a867aa360d99350646b2e9a904e522b3a17 Mon Sep 17 00:00:00 2001 From: Jeffrey Finkelstein Date: Tue, 27 Jul 2021 22:43:04 -0400 Subject: [PATCH] tests: better arg names in link helper functions Change the argument names in * `AtPath::hard_link()`, * `AtPath::symlink_file()`, and * `AtPath::symlink_dir()`, from `src` and `dest` to `original` and `link` to match the arguments of the corresponding functions from the Rust standard library. For example, see `std::os::unix::fs::symlink()`. --- tests/common/util.rs | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/tests/common/util.rs b/tests/common/util.rs index 68b7caa9b..41389d567 100644 --- a/tests/common/util.rs +++ b/tests/common/util.rs @@ -591,28 +591,40 @@ impl AtPath { } } - pub fn hard_link(&self, src: &str, dst: &str) { + pub fn hard_link(&self, original: &str, link: &str) { log_info( "hard_link", - &format!("{},{}", self.plus_as_string(src), self.plus_as_string(dst)), + &format!( + "{},{}", + self.plus_as_string(original), + self.plus_as_string(link) + ), ); - hard_link(&self.plus(src), &self.plus(dst)).unwrap(); + hard_link(&self.plus(original), &self.plus(link)).unwrap(); } - pub fn symlink_file(&self, src: &str, dst: &str) { + pub fn symlink_file(&self, original: &str, link: &str) { log_info( "symlink", - &format!("{},{}", self.plus_as_string(src), self.plus_as_string(dst)), + &format!( + "{},{}", + self.plus_as_string(original), + self.plus_as_string(link) + ), ); - symlink_file(&self.plus(src), &self.plus(dst)).unwrap(); + symlink_file(&self.plus(original), &self.plus(link)).unwrap(); } - pub fn symlink_dir(&self, src: &str, dst: &str) { + pub fn symlink_dir(&self, original: &str, link: &str) { log_info( "symlink", - &format!("{},{}", self.plus_as_string(src), self.plus_as_string(dst)), + &format!( + "{},{}", + self.plus_as_string(original), + self.plus_as_string(link) + ), ); - symlink_dir(&self.plus(src), &self.plus(dst)).unwrap(); + symlink_dir(&self.plus(original), &self.plus(link)).unwrap(); } pub fn is_symlink(&self, path: &str) -> bool {