Skip to content

Commit

Permalink
Split OutputFile::bindst into OutputFile::bin_dst
Browse files Browse the repository at this point in the history
  • Loading branch information
dwijnand committed Dec 3, 2018
1 parent bfd6618 commit b0a6c42
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/context/compilation_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/core/compiler/context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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((
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b0a6c42

Please sign in to comment.