diff --git a/src/cli.rs b/src/cli.rs index 7e01424..ed36055 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -87,7 +87,7 @@ fn parse_signal(arg: &str) -> Result { Ok(str_arg) => { let signal_str = str_arg.to_uppercase(); let signal = Signal::from_str(signal_str.as_str())?; - return Ok(signal); + Ok(signal) } Err(e) => Err(std::io::Error::new(std::io::ErrorKind::Other, e)), } diff --git a/src/docker.rs b/src/docker.rs index 1a4f3f1..0abdd18 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -17,7 +17,7 @@ impl DockerContainer { /// /// * `name` - A container name. /// * `signal` - A enum value representing the signal type. - pub fn kill_container(name: &String, signal: Signal) -> Result<(), Error> { + pub fn kill_container(name: &str, signal: Signal) -> Result<(), Error> { let rt = Runtime::new()?; rt.block_on(async { let docker = Docker::connect_with_socket_defaults() @@ -63,8 +63,8 @@ impl DockerContainer { .as_ref()? .first() .map(|name| DockerContainer { - name: if name.starts_with('/') { - name[1..].to_string() + name: if let Some(stripped) = name.strip_prefix('/') { + stripped.to_string() } else { name.clone() }, diff --git a/src/killport.rs b/src/killport.rs index a17e7c8..4265352 100644 --- a/src/killport.rs +++ b/src/killport.rs @@ -69,10 +69,7 @@ impl Killable for DockerContainer { /// /// * `signal` - A enum value representing the signal type. fn kill(&self, signal: Signal) -> Result { - if let Err(err) = Self::kill_container(&self.name, signal) { - return Err(err); - } - + Self::kill_container(&self.name, signal)?; Ok(true) } diff --git a/src/linux.rs b/src/linux.rs index de0151a..a11e028 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -98,7 +98,7 @@ pub fn find_target_processes(port: u16) -> Result, Error> { debug!("Found process '{}' with PID {}", name, process.pid()); target_pids.push(NativeProcess { pid: Pid::from_raw(process.pid), - name: name, + name }); } }