Skip to content

Commit c57eb1b

Browse files
committed
rename src/dst to original/link
this is consistent with std and makes it much easier to understand what's actually happening
1 parent f6611d3 commit c57eb1b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/bootstrap/doc.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -959,21 +959,21 @@ impl Step for UnstableBookGen {
959959
}
960960
}
961961

962-
fn symlink_dir_force(config: &Config, src: &Path, dst: &Path) -> io::Result<()> {
962+
fn symlink_dir_force(config: &Config, original: &Path, link: &Path) -> io::Result<()> {
963963
if config.dry_run() {
964964
return Ok(());
965965
}
966-
if let Ok(m) = fs::symlink_metadata(dst) {
966+
if let Ok(m) = fs::symlink_metadata(link) {
967967
if m.file_type().is_dir() {
968-
fs::remove_dir_all(dst)?;
968+
fs::remove_dir_all(link)?;
969969
} else {
970970
// handle directory junctions on windows by falling back to
971971
// `remove_dir`.
972-
fs::remove_file(dst).or_else(|_| fs::remove_dir(dst))?;
972+
fs::remove_file(link).or_else(|_| fs::remove_dir(link))?;
973973
}
974974
}
975975

976-
symlink_dir(config, src, dst)
976+
symlink_dir(config, original, link)
977977
}
978978

979979
#[derive(Ord, PartialOrd, Debug, Copy, Clone, Hash, PartialEq, Eq)]

src/bootstrap/util.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ pub(crate) fn program_out_of_date(stamp: &Path, key: &str) -> bool {
134134

135135
/// Symlinks two directories, using junctions on Windows and normal symlinks on
136136
/// Unix.
137-
pub fn symlink_dir(config: &Config, src: &Path, dest: &Path) -> io::Result<()> {
137+
pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<()> {
138138
if config.dry_run() {
139139
return Ok(());
140140
}
141-
let _ = fs::remove_dir(dest);
142-
return symlink_dir_inner(src, dest);
141+
let _ = fs::remove_dir(link);
142+
return symlink_dir_inner(original, link);
143143

144144
#[cfg(not(windows))]
145-
fn symlink_dir_inner(src: &Path, dest: &Path) -> io::Result<()> {
145+
fn symlink_dir_inner(original: &Path, link: &Path) -> io::Result<()> {
146146
use std::os::unix::fs;
147-
fs::symlink(src, dest)
147+
fs::symlink(original, link)
148148
}
149149

150150
#[cfg(windows)]

0 commit comments

Comments
 (0)