refactor: clean up unused deps

Signed-off-by: jiaxiao zhou <[email protected]>
containerd · Aug 17, 2023 · dd078b7 · dd078b7
1 parent c809ea3
commit dd078b7
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/containerd-shim-wasm/Cargo.toml b/crates/containerd-shim-wasm/Cargo.toml
@@ -27,7 +27,6 @@ log = { workspace = true }
 clone3 = "0.2"
 libc = { workspace = true }
 caps = "0.5"
-proc-mounts = "0.3"
 libcontainer = { workspace = true, optional = true, default-features = false }
 cgroups-rs = "0.3.3"
 
@@ -36,10 +35,7 @@ ttrpc-codegen = { version = "0.4.2", optional = true }
 
 [dev-dependencies]
 tempfile = "3"
-pretty_assertions = "1"
 signal-hook = "0.3"
-env_logger = { workspace = true }
-rand = "0.8"
 
 [features]
 default = []

diff --git a/crates/containerd-shim-wasm/src/sandbox/instance_utils.rs b/crates/containerd-shim-wasm/src/sandbox/instance_utils.rs
@@ -132,7 +132,7 @@ mod tests {
         write!(&opts_file, "{}", serde_json::to_string(&opts)?)?;
         let root = determine_rootdir(
             dir.path(),
-            namespace.into(),
+            namespace,
             &PathBuf::from("/run/containerd/runtime"),
         )?;
         assert_eq!(root, rootdir.join(namespace));
@@ -145,7 +145,7 @@ mod tests {
         let namespace = "test_namespace";
         let root = determine_rootdir(
             dir.path(),
-            namespace.into(),
+            namespace,
             &PathBuf::from("/run/containerd/runtime"),
         )?;
         assert!(root.is_absolute());

diff --git a/crates/containerd-shim-wasmedge/Cargo.toml b/crates/containerd-shim-wasmedge/Cargo.toml
@@ -12,7 +12,6 @@ wasmedge-sdk = { version = "0.11.2" }
 wasmedge-sys = "*"
 chrono = { workspace = true }
 anyhow = { workspace = true }
-cap-std = { workspace = true }
 oci-spec = { workspace = true, features = ["runtime"] }
 thiserror = { workspace = true }
 serde_json = { workspace = true }
@@ -23,7 +22,6 @@ dbus = { version = "*", optional = true }
 
 [dev-dependencies]
 tempfile = "3.7"
-pretty_assertions = "1"
 serial_test = "*"
 
 [features]

diff --git a/crates/containerd-shim-wasmedge/src/instance.rs b/crates/containerd-shim-wasmedge/src/instance.rs
@@ -1,5 +1,4 @@
 use anyhow::Context;
-use anyhow::Result;
 use containerd_shim_wasm::libcontainer_instance::LibcontainerInstance;
 use containerd_shim_wasm::libcontainer_instance::LinuxContainerExecutor;
 use containerd_shim_wasm::sandbox::error::Error;
@@ -191,7 +190,7 @@ mod wasitest {
     fn run_wasi_test(dir: &TempDir, wasmbytes: Cow<[u8]>) -> Result<(u32, DateTime<Utc>), Error> {
         create_dir(dir.path().join("rootfs"))?;
         let rootdir = dir.path().join("runwasi");
-        create_dir(&rootdir)?;
+        create_dir(rootdir)?;
         let rootdir = PathBuf::from("/path/to/root");
         let mut opts = HashMap::new();
         opts.insert("root", rootdir);

diff --git a/crates/containerd-shim-wasmtime/Cargo.toml b/crates/containerd-shim-wasmtime/Cargo.toml
@@ -40,7 +40,6 @@ libc = { workspace = true }
 [dev-dependencies]
 tempfile = "3.7"
 libc = { workspace = true }
-pretty_assertions = "1"
 env_logger = "0.10"
 
 [features]

diff --git a/crates/containerd-shim-wasmtime/src/instance.rs b/crates/containerd-shim-wasmtime/src/instance.rs
@@ -252,7 +252,7 @@ mod wasitest {
     ) -> Result<(u32, DateTime<Utc>), Error> {
         create_dir(dir.path().join("rootfs"))?;
         let rootdir = dir.path().join("runwasi");
-        create_dir(&rootdir)?;
+        create_dir(rootdir)?;
         let rootdir = PathBuf::from("/path/to/root");
         let mut opts = HashMap::new();
         opts.insert("root", rootdir);

diff --git a/crates/oci-tar-builder/Cargo.toml b/crates/oci-tar-builder/Cargo.toml
@@ -7,7 +7,6 @@ edition.workspace = true
 tar = { workspace = true }
 sha256 = { workspace = true }
 log = { workspace = true }
-env_logger = { workspace = true }
 oci-spec =  { workspace = true }
 anyhow = { workspace = true }
 serde = { workspace = true }