Skip to content

Fix some style issues given by clippy #146

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

Merged
alexcrichton merged 5 commits into from
Apr 12, 2017
Merged

Fix some style issues given by clippy #146

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f92462f
Remove explicit return statements
Mar 17, 2017
6f8a5ad
Switch single string constant to char constant
Mar 17, 2017
666b490
Remove .ok() call as .expect() can be called on Result
Mar 17, 2017
8430aee
Switch to better fallback methods
Mar 17, 2017
436abb5
Remove reference in favour for dereferencing variable
Mar 17, 2017
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
15 changes: 7 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ impl Config {

for &(ref key, ref value) in self.definitions.iter() {
let lead = if let ToolFamily::Msvc = cmd.family {"/"} else {"-"};
if let &Some(ref value) = value {
if let Some(ref value) = *value {
cmd.args.push(format!("{}D{}={}", lead, key, value).into());
} else {
cmd.args.push(format!("{}D{}", lead, key).into());
Expand All @@ -706,7 +706,7 @@ impl Config {
cmd.arg("/I").arg(directory);
}
for &(ref key, ref value) in self.definitions.iter() {
if let &Some(ref value) = value {
if let Some(ref value) = *value {
cmd.arg(&format!("/D{}={}", key, value));
} else {
cmd.arg(&format!("/D{}", key));
Expand All @@ -732,7 +732,7 @@ impl Config {
if target.contains("msvc") {
let mut cmd = match self.archiver {
Some(ref s) => self.cmd(s),
None => windows_registry::find(&target, "lib.exe").unwrap_or(self.cmd("lib.exe")),
None => windows_registry::find(&target, "lib.exe").unwrap_or_else(|| self.cmd("lib.exe")),
};
let mut out = OsString::from("/OUT:");
out.push(dst);
Expand All @@ -752,7 +752,6 @@ impl Config {
// if hard-link fails, just copy (ignoring the number of bytes written)
fs::copy(&dst, &lib_dst).map(|_| ())
})
.ok()
.expect("Copying from {:?} to {:?} failed.");;
} else {
let ar = self.get_ar();
Expand Down Expand Up @@ -818,7 +817,7 @@ impl Config {
for &(ref a, ref b) in self.env.iter() {
cmd.env(a, b);
}
return cmd;
cmd
}

fn get_base_compiler(&self) -> Tool {
Expand Down Expand Up @@ -848,7 +847,7 @@ impl Config {
for arg in args {
t.args.push(arg.into());
}
return t;
t
})
.or_else(|| {
if target.contains("emscripten") {
Expand Down Expand Up @@ -950,7 +949,7 @@ impl Config {
self.get_var(name).ok().map(|tool| {
let whitelist = ["ccache", "distcc"];
for t in whitelist.iter() {
if tool.starts_with(t) && tool[t.len()..].starts_with(" ") {
if tool.starts_with(t) && tool[t.len()..].starts_with(' ') {
return (t.to_string(), vec![tool[t.len()..].trim_left().to_string()]);
}
}
Expand Down Expand Up @@ -1110,7 +1109,7 @@ fn run_output(cmd: &mut Command, program: &str) -> Vec<u8> {
if !status.success() {
fail(&format!("command did not execute successfully, got: {}", status));
}
return stdout
stdout
}

fn spawn(cmd: &mut Command, program: &str) -> (Child, JoinHandle<()>) {
Expand Down