diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/builder.rs | 4 | ||||
| -rw-r--r-- | src/client.rs | 4 | ||||
| -rw-r--r-- | src/daemon.rs | 10 | ||||
| -rw-r--r-- | src/suite.rs | 3 | ||||
| -rw-r--r-- | src/summain.rs | 4 |
5 files changed, 8 insertions, 17 deletions
diff --git a/src/builder.rs b/src/builder.rs index ac414c7..f2aadf2 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -92,7 +92,7 @@ impl ObnamBuilder { } let v = String::from_utf8_lossy(&output.stdout); - let v = v.strip_suffix('\n').or(Some(&v)).unwrap().to_string(); + let v = v.strip_suffix('\n').unwrap_or(&v).to_string(); Ok(v) } @@ -140,7 +140,7 @@ fn git_create_branch(dir: &Path, branch: &str, commit: &str) -> Result<(), Obnam fn git_resolve(dir: &Path, commit: &str) -> Result<String, ObnamBuilderError> { run("git", &["rev-parse", commit], dir) - .map(|s| s.strip_suffix('\n').or(Some("")).unwrap().to_string()) + .map(|s| s.strip_suffix('\n').unwrap_or("").to_string()) .map_err(ObnamBuilderError::Git) } diff --git a/src/client.rs b/src/client.rs index dd2a624..43a52ec 100644 --- a/src/client.rs +++ b/src/client.rs @@ -58,9 +58,7 @@ impl ObnamClient { std::process::exit(1); } - Ok(String::from_utf8_lossy(&output.stdout) - .to_owned() - .to_string()) + Ok(String::from_utf8_lossy(&output.stdout).to_string()) } } diff --git a/src/daemon.rs b/src/daemon.rs index 8bf8adb..10c197c 100644 --- a/src/daemon.rs +++ b/src/daemon.rs @@ -84,7 +84,7 @@ impl DaemonManager { info!("start daemon: {:?}", argv); let pid = NamedTempFile::new()?; let output = Command::new("daemonize") - .args(&[ + .args([ "-c", "/", "-e", @@ -134,13 +134,9 @@ impl DaemonManager { if !cmd.is_empty() { cmd.push(' '); } - cmd.push_str( - &String::from_utf8_lossy(arg.as_bytes()) - .to_owned() - .to_string(), - ); + cmd.push_str(String::from_utf8_lossy(arg.as_bytes()).to_string().as_ref()); } - let err = read(&stderr).map_err(DaemonError::Stderr)?; + let err = read(stderr).map_err(DaemonError::Stderr)?; let err = String::from_utf8_lossy(&err).into_owned(); Err(DaemonError::Timeout(self.timeout.as_millis(), cmd, err)) } diff --git a/src/suite.rs b/src/suite.rs index 86c4c6d..aeeff80 100644 --- a/src/suite.rs +++ b/src/suite.rs @@ -250,8 +250,7 @@ impl Benchmark { .client .run(&["resolve", "latest"])? .strip_suffix('\n') - .or(Some("")) - .unwrap() + .unwrap_or("") .to_string(); debug!("backed up generation {}", gen_id); self.gen_ids.insert(n, gen_id); diff --git a/src/summain.rs b/src/summain.rs index ce9cf0f..3c977f1 100644 --- a/src/summain.rs +++ b/src/summain.rs @@ -19,7 +19,5 @@ pub fn summain(root: &Path) -> Result<String, SummainError> { std::process::exit(1); } - Ok(String::from_utf8_lossy(&output.stdout) - .to_owned() - .to_string()) + Ok(String::from_utf8_lossy(&output.stdout).to_string()) } |