From 319e069106381d9311e598c592515fedefc60dd0 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:14:43 +0200 Subject: unwrap-or Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/builder.rs b/src/builder.rs index ac414c7..b94dbe4 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) } -- cgit v1.2.1 From 92ce5228ec468d573db67f73b8faedf7b2b04ea0 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:15:19 +0200 Subject: unwrap-or Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/builder.rs b/src/builder.rs index b94dbe4..f2aadf2 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -140,7 +140,7 @@ fn git_create_branch(dir: &Path, branch: &str, commit: &str) -> Result<(), Obnam fn git_resolve(dir: &Path, commit: &str) -> Result { 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) } -- cgit v1.2.1 From 0ff4ff6432538f0eefa031655c290459f981fe66 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:16:07 +0200 Subject: to_owned Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/client.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') 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()) } } -- cgit v1.2.1 From c21dd2c62fa089df5910f05eede744a387860acd Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:16:42 +0200 Subject: slice Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/daemon.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/daemon.rs b/src/daemon.rs index 8bf8adb..a4406a4 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", -- cgit v1.2.1 From 04bf4b107c6e2e2414956b970cfcc0b44f470117 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:17:06 +0200 Subject: to_owned Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/daemon.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/daemon.rs b/src/daemon.rs index a4406a4..3e3a189 100644 --- a/src/daemon.rs +++ b/src/daemon.rs @@ -134,11 +134,7 @@ 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()); } let err = read(&stderr).map_err(DaemonError::Stderr)?; let err = String::from_utf8_lossy(&err).into_owned(); -- cgit v1.2.1 From a174166b9f3d9ba2bed09bf2a7c0ff80188ca6a2 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:17:43 +0200 Subject: as_ref Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/daemon.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/daemon.rs b/src/daemon.rs index 3e3a189..f615333 100644 --- a/src/daemon.rs +++ b/src/daemon.rs @@ -134,7 +134,7 @@ impl DaemonManager { if !cmd.is_empty() { cmd.push(' '); } - cmd.push_str(&String::from_utf8_lossy(arg.as_bytes()).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 = String::from_utf8_lossy(&err).into_owned(); -- cgit v1.2.1 From 2bbe1bbcbb6552915bb1238a61cfb70e5da24342 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:18:01 +0200 Subject: unnecessary borrow Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/daemon.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/daemon.rs b/src/daemon.rs index f615333..10c197c 100644 --- a/src/daemon.rs +++ b/src/daemon.rs @@ -136,7 +136,7 @@ impl DaemonManager { } 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)) } -- cgit v1.2.1 From aecbc022010cca3eed48d2d3c4aa54de2d68f29f Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:18:31 +0200 Subject: unwrap_or Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/suite.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.1 From 1f75fe4477d2a9fefb0c9ae703399e2dcbd05e36 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2024 19:18:51 +0200 Subject: to_owned Signed-off-by: Lars Wirzenius Sponsored-by: author --- src/summain.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') 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 { std::process::exit(1); } - Ok(String::from_utf8_lossy(&output.stdout) - .to_owned() - .to_string()) + Ok(String::from_utf8_lossy(&output.stdout).to_string()) } -- cgit v1.2.1