From b0a6c42603d04ad5b3459d60171392022b3b0bea Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 3 Dec 2018 19:07:14 +0000 Subject: [PATCH] Split OutputFile::bindst into OutputFile::bin_dst --- src/cargo/core/compiler/context/compilation_files.rs | 2 +- src/cargo/core/compiler/context/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs index cb13d669061..c74ae09717c 100644 --- 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 index 40eb985c16f..59c7f2f2033 100644 --- 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);