about summary refs log tree commit diff
diff options
context:
space:
mode:
authorjyn <github@jyn.dev>2023-06-03 14:31:36 -0500
committerjyn <github@jyn.dev>2023-06-03 14:31:36 -0500
commitc57eb1bb6e8284b141f715d83c4572559652586e (patch)
treed36a5a2657363253e5eeff0b7e9a561a13fc654f
parentf6611d34f13be7b105a6eda384aa25e30f3c733b (diff)
downloadrust-c57eb1bb6e8284b141f715d83c4572559652586e.tar.gz
rust-c57eb1bb6e8284b141f715d83c4572559652586e.zip
rename src/dst to original/link
this is consistent with std and makes it much easier to understand what's actually happening
-rw-r--r--src/bootstrap/doc.rs10
-rw-r--r--src/bootstrap/util.rs10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index d6210ed59c4..15337a4f8d6 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -959,21 +959,21 @@ impl Step for UnstableBookGen {
     }
 }
 
-fn symlink_dir_force(config: &Config, src: &Path, dst: &Path) -> io::Result<()> {
+fn symlink_dir_force(config: &Config, original: &Path, link: &Path) -> io::Result<()> {
     if config.dry_run() {
         return Ok(());
     }
-    if let Ok(m) = fs::symlink_metadata(dst) {
+    if let Ok(m) = fs::symlink_metadata(link) {
         if m.file_type().is_dir() {
-            fs::remove_dir_all(dst)?;
+            fs::remove_dir_all(link)?;
         } else {
             // handle directory junctions on windows by falling back to
             // `remove_dir`.
-            fs::remove_file(dst).or_else(|_| fs::remove_dir(dst))?;
+            fs::remove_file(link).or_else(|_| fs::remove_dir(link))?;
         }
     }
 
-    symlink_dir(config, src, dst)
+    symlink_dir(config, original, link)
 }
 
 #[derive(Ord, PartialOrd, Debug, Copy, Clone, Hash, PartialEq, Eq)]
diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
index e4bbccdb067..7e29f671f02 100644
--- a/src/bootstrap/util.rs
+++ b/src/bootstrap/util.rs
@@ -134,17 +134,17 @@ pub(crate) fn program_out_of_date(stamp: &Path, key: &str) -> bool {
 
 /// Symlinks two directories, using junctions on Windows and normal symlinks on
 /// Unix.
-pub fn symlink_dir(config: &Config, src: &Path, dest: &Path) -> io::Result<()> {
+pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<()> {
     if config.dry_run() {
         return Ok(());
     }
-    let _ = fs::remove_dir(dest);
-    return symlink_dir_inner(src, dest);
+    let _ = fs::remove_dir(link);
+    return symlink_dir_inner(original, link);
 
     #[cfg(not(windows))]
-    fn symlink_dir_inner(src: &Path, dest: &Path) -> io::Result<()> {
+    fn symlink_dir_inner(original: &Path, link: &Path) -> io::Result<()> {
         use std::os::unix::fs;
-        fs::symlink(src, dest)
+        fs::symlink(original, link)
     }
 
     #[cfg(windows)]