Skip to content

Commit

Permalink
Auto merge of #6496 - k-nasa:delete_unnecessary_return, r=ehuss
Browse files Browse the repository at this point in the history
Delete unnecessary 'return'

Unnecessary return keyword deleted as it is also in the title
  • Loading branch information
bors committed Dec 29, 2018
2 parents 9bf8592 + 3b244e2 commit f58b341
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/cargo/core/compiler/context/compilation_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ pub struct OutputFile {
impl OutputFile {
/// Gets the hardlink if present. Otherwise returns the path.
pub fn bin_dst(&self) -> &PathBuf {
return match self.hardlink {
match self.hardlink {
Some(ref link_dst) => link_dst,
None => &self.path,
};
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
return Ok(Option::Some(output.bin_dst().clone()));
}
}
return Ok(None);
Ok(None)
}

pub fn prepare_units(
Expand Down

0 comments on commit f58b341

Please sign in to comment.