Merge pull request #274 from Metaswitch/md/mergedepbot

Fixing up Dependabot merges and clippy moans

Author: Max Dymond

Cargo.lock

@@ -19,14 +19,14 @@ log = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_yaml = "0.9"
 structopt = "0.3"
-uuid = { version = "1.2", features = ["v4"] }
+uuid = { version = "1.3", features = ["v4"] }
 yaml-rust = "0.4.4"
 simplelog = "0.12"
-nix = { version = "0.24", default-features = false, features = ["user"] }
+nix = { version = "0.26", default-features = false, features = ["user"] }
 shlex = "1.1"
-sha2 = "0.10.5"
-anyhow = "1.0.66"
-thiserror = "1.0.37"
+sha2 = "0.10.6"
+anyhow = "1.0.69"
+thiserror = "1.0.39"
 
 [dev-dependencies]
-tempfile = "3.3.0"
+tempfile = "3.4.0"

Cargo.toml

@@ -28,7 +28,7 @@ impl Drop for DaemonHandle {
     fn drop(&mut self) {
         info!("Stopping daemon docker container '{}'", self.name);
         Command::new("docker")
-            .args(&["kill", &self.name])
+            .args(["kill", &self.name])
             .stdin(Stdio::null())
             .stdout(Stdio::null())
             .stderr(Stdio::null())
@@ -78,8 +78,8 @@ impl DockerCommandBuilder {
     pub fn start_as_daemon(self, command: &[&str]) -> Result<DaemonHandle, Error> {
         debug!("Starting daemon container '{}'", self.name);
         let exit_status = Command::new("docker")
-            .args(&["run", "--rm"])
-            .args(&["--name", &self.name])
+            .args(["run", "--rm"])
+            .args(["--name", &self.name])
             .args(&self.build_volume_switches())
             .args(self.build_environment_switches())
             .args(self.build_docker_switches())
@@ -202,6 +202,6 @@ pub fn enable_docker_in_docker(
 ) -> Result<DockerCommandBuilder, Error> {
     Ok(command
         .add_docker_switch("--link")
-        .add_docker_switch(&format!("{}:floki-docker", dind.name()))
+        .add_docker_switch(format!("{}:floki-docker", dind.name()))
         .add_environment("DOCKER_HOST", "tcp://floki-docker:2375"))
 }