From f92462fd84b635d8268104a9dbe4edd30a1d48fa Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 17 Mar 2017 17:03:42 +0000 Subject: [PATCH 1/5] Remove explicit return statements --- src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 2e23beb03..47b2fae1d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -818,7 +818,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 { @@ -848,7 +848,7 @@ impl Config { for arg in args { t.args.push(arg.into()); } - return t; + t }) .or_else(|| { if target.contains("emscripten") { @@ -1110,7 +1110,7 @@ fn run_output(cmd: &mut Command, program: &str) -> Vec { if !status.success() { fail(&format!("command did not execute successfully, got: {}", status)); } - return stdout + stdout } fn spawn(cmd: &mut Command, program: &str) -> (Child, JoinHandle<()>) { From 6f8a5ad36946eb75850f79ee631d3b9a3bff78ae Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 17 Mar 2017 17:04:50 +0000 Subject: [PATCH 2/5] Switch single string constant to char constant --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 47b2fae1d..6fc8053ff 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -950,7 +950,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()]); } } From 666b4904a40d2d0f6e6d981629ea6164188e601d Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 17 Mar 2017 17:05:19 +0000 Subject: [PATCH 3/5] Remove .ok() call as .expect() can be called on Result --- src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 6fc8053ff..d01a65b38 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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(); From 8430aee1aac53903b9c45c3fb3d87a8c3d6db561 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 17 Mar 2017 17:05:45 +0000 Subject: [PATCH 4/5] Switch to better fallback methods --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index d01a65b38..625b69337 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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); From 436abb5a4e9513ede5e20cf940a9a4f83ada7f6f Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 17 Mar 2017 17:06:35 +0000 Subject: [PATCH 5/5] Remove reference in favour for dereferencing variable --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 625b69337..e336d63cc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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()); @@ -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));