Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split OutputFile::bindst into OutputFile::bin_dst #6372

Merged
merged 1 commit into from
Dec 3, 2018
Merged

Split OutputFile::bindst into OutputFile::bin_dst #6372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/context/compilation_files.rs
View file
Open in desktop
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
View file
Open in desktop
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