Skip to content

Commit 485670b

Browse files
committed
Auto merge of #6372 - dwijnand:bin_dst, r=dwijnand
Split OutputFile::bindst into OutputFile::bin_dst None
2 parents bfd6618 + b0a6c42 commit 485670b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/cargo/core/compiler/context/compilation_files.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub struct OutputFile {
5151

5252
impl OutputFile {
5353
/// Gets the hardlink if present. Otherwise returns the path.
54-
pub fn bindst(&self) -> &PathBuf {
54+
pub fn bin_dst(&self) -> &PathBuf {
5555
return match self.hardlink {
5656
Some(ref link_dst) => link_dst,
5757
None => &self.path,

src/cargo/core/compiler/context/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
163163
continue;
164164
}
165165

166-
let bindst = output.bindst();
166+
let bindst = output.bin_dst();
167167

168168
if unit.mode == CompileMode::Test {
169169
self.compilation.tests.push((
@@ -282,7 +282,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
282282
let is_test = unit.mode.is_any_test() && !unit.mode.is_check();
283283

284284
if is_binary || is_test {
285-
return Ok(Option::Some(output.bindst().clone()));
285+
return Ok(Option::Some(output.bin_dst().clone()));
286286
}
287287
}
288288
return Ok(None);

0 commit comments

Comments
 (0)