Auto merge of #6372 - dwijnand:bin_dst, r=dwijnand

Split OutputFile::bindst into OutputFile::bin_dst None
rust-lang · Dec 3, 2018 · 485670b · 485670b
2 parents bfd6618 + b0a6c42
commit 485670b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs
@@ -51,7 +51,7 @@ pub struct OutputFile {
 
 impl OutputFile {
     /// Gets the hardlink if present. Otherwise returns the path.
-    pub fn bindst(&self) -> &PathBuf {
+    pub fn bin_dst(&self) -> &PathBuf {
         return match self.hardlink {
             Some(ref link_dst) => link_dst,
             None => &self.path,

diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
@@ -163,7 +163,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
                     continue;
                 }
 
-                let bindst = output.bindst();
+                let bindst = output.bin_dst();
 
                 if unit.mode == CompileMode::Test {
                     self.compilation.tests.push((
@@ -282,7 +282,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
             let is_test = unit.mode.is_any_test() && !unit.mode.is_check();
 
             if is_binary || is_test {
-                return Ok(Option::Some(output.bindst().clone()));
+                return Ok(Option::Some(output.bin_dst().clone()));
             }
         }
         return Ok(None);