cargo clippy fixes

Author: maximevanhees

src/app/api.rs

@@ -512,7 +512,6 @@ impl Api {
             Err(err) => {
                 error!("failed to read request: {}", err);
                 let _ = stream.write_all("bad request".as_ref()).await;
-                return;
             }
         }
     }
@@ -722,7 +721,7 @@ impl Client {
         let data = data.trim_end();
 
         // Parse the JSON-RPC response
-        let response: JsonRpcResponse = encoder::from_str(&data)?;
+        let response: JsonRpcResponse = encoder::from_str(data)?;
 
         // Handle the response
         if let Some(error) = response.error {
@@ -764,7 +763,7 @@ impl Client {
         let data = String::from_utf8(buffer)?;
         let data = data.trim_end();
 
-        let response: Response = encoder::from_str(&data)?;
+        let response: Response = encoder::from_str(data)?;
 
         match response.state {
             State::Ok => Ok(response.body),

src/manager/mod.rs

@@ -47,10 +47,7 @@ type Handler = oneshot::Sender<WaitStatus>;
 
 impl Process {
     pub fn new<S: Into<String>>(cmd: S, cwd: S, env: Option<HashMap<String, String>>) -> Process {
-        let env = match env {
-            None => HashMap::new(),
-            Some(env) => env,
-        };
+        let env = env.unwrap_or_default();
 
         Process {
             env,

src/zinit/lifecycle.rs

@@ -97,7 +97,7 @@ impl LifecycleManager {
         let service = Arc::new(RwLock::new(ZInitService::new(service, State::Unknown)));
         services.insert(name.clone(), Arc::clone(&service));
 
-        let lifecycle = self.clone();
+        let lifecycle = self.clone_lifecycle();
         debug!("service '{}' monitored", name);
         tokio::spawn(lifecycle.watch_service(name, service));
 
@@ -132,7 +132,7 @@ impl LifecycleManager {
             .get(name.as_ref())
             .ok_or_else(|| ZInitError::unknown_service(name.as_ref()))?;
 
-        let lifecycle = self.clone();
+        let lifecycle = self.clone_lifecycle();
         tokio::spawn(lifecycle.watch_service(name.as_ref().into(), Arc::clone(service)));
 
         Ok(())
@@ -284,7 +284,7 @@ impl LifecycleManager {
                     }
 
                     let shutdown_timeout = shutdown_timeouts.remove(child);
-                    let lifecycle = self.clone();
+                    let lifecycle = self.clone_lifecycle();
                     tokio::spawn(Self::kill_wait(
                         lifecycle,
                         child.to_string(),
@@ -551,7 +551,7 @@ impl LifecycleManager {
 
             let mut handler = None;
             if !config.one_shot {
-                let lifecycle = self.clone();
+                let lifecycle = self.clone_lifecycle();
                 handler = Some(tokio::spawn(
                     lifecycle.test_loop(name.clone(), config.clone()),
                 ));
@@ -595,7 +595,7 @@ impl LifecycleManager {
     }
 
     /// Clone the lifecycle manager
-    pub fn clone(&self) -> Self {
+    pub fn clone_lifecycle(&self) -> Self {
         Self {
             pm: self.pm.clone(),
             services: Arc::clone(&self.services),

src/zinit/mod.rs

@@ -40,7 +40,7 @@ impl ZInit {
     pub fn serve(&self) {
         self.lifecycle.process_manager().start();
         if self.lifecycle.is_container_mode() {
-            let lifecycle = self.lifecycle.clone();
+            let lifecycle = self.lifecycle.clone_lifecycle();
             tokio::spawn(async move {
                 use tokio::signal::unix;
 

src/zinit/ord.rs

@@ -18,7 +18,7 @@ pub async fn service_dependency_order(services: Arc<RwLock<ServiceTable>>) -> Pr
         for child in service.service.after.iter() {
             children
                 .entry(name.into())
-                .or_insert_with(Vec::new)
+                .or_default()
                 .push(child.into());
             *indegree.entry(child.into()).or_insert(0) += 1;
         }