remove unused dependencies

tjhu · tjhu · commit 29b4f25a89ca · 2020-05-28T19:30:07.000-05:00
diff --git a/sys/driver/ixgbe/Cargo.toml b/sys/driver/ixgbe/Cargo.toml
@@ -60,7 +60,7 @@ default-features = false
 
 [features]
 default = [
-    # "nullnet",
+    "nullnet",
 ]
 
 nullnet = []
diff --git a/sys/init/Cargo.toml b/sys/init/Cargo.toml
@@ -39,8 +39,8 @@ default-features = false
 
 [features]
 default = [
-    "test_ab",
-    "test_cd",
+    # "test_ab",
+    # "test_cd",
     "shadow",
     # "benchnet",
     # "benchnvme"
diff --git a/sys/lib/libdma/Cargo.toml b/sys/lib/libdma/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-slabmalloc = { path = "../slabmalloc" }
 libsyscalls = { path = "../libsyscalls", version = "0.1.0" }
 
 #[dev-dependencies]
diff --git a/sys/lib/libsyscalls/Cargo.toml b/sys/lib/libsyscalls/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 spin = { path = "../../../lib/spin-rs" }
-x86_64 = "0.7.5"
 syscalls = { path = "../../interfaces/syscalls", version = "0.1.0"}
 platform = { path = "../../interfaces/platform", version = "0.1.0"}
 pc-keyboard = "0.3.1"
diff --git a/sys/lib/libtime/Cargo.toml b/sys/lib/libtime/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 #spin = "0.5.2"
-x86_64 = "0.7.5"
 libsyscalls = { path = "../libsyscalls", version = "0.1.0"}
 console = { path = "../console", version = "0.1.0"}
 
diff --git a/sys/lib/tls/Cargo.toml b/sys/lib/tls/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-slabmalloc = { path = "../slabmalloc" }
 libsyscalls = { path = "../libsyscalls", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }
 hashbrown = "0.6"
diff --git a/usr/proxy/Cargo.toml b/usr/proxy/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../sys/lib/slabmalloc" }
 malloc = { path = "../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../lib/spin-rs" }
diff --git a/usr/shadow/net/Cargo.toml b/usr/shadow/net/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }
diff --git a/usr/shadow/nvme/Cargo.toml b/usr/shadow/nvme/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }
diff --git a/usr/test/dom_a/Cargo.toml b/usr/test/dom_a/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 tls = { path = "../../../sys/lib/tls", version = "0.1.0" }
diff --git a/usr/test/dom_b/Cargo.toml b/usr/test/dom_b/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }
diff --git a/usr/test/dom_c/Cargo.toml b/usr/test/dom_c/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }
diff --git a/usr/test/dom_d/Cargo.toml b/usr/test/dom_d/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }
diff --git a/usr/test/shadow/Cargo.toml b/usr/test/shadow/Cargo.toml
@@ -17,15 +17,13 @@ panic = "abort"
 debug = true
 
 [dependencies]
-x86_64 = "0.7.5"
 syscalls = { path = "../../../sys/interfaces/syscalls", version = "0.1.0" }
 usr = { path = "../../../sys/interfaces/usr", version = "0.1.0" }
 create = { path = "../../../sys/interfaces/create", version = "0.1.0" }
 proxy = { path = "../../../sys/interfaces/proxy", version = "0.1.0" }
 libsyscalls = { path = "../../../sys/lib/libsyscalls", version = "0.1.0" }
 libtime = { path = "../../../sys/lib/libtime", version = "0.1.0" }
 console = { path = "../../../sys/lib/console", version = "0.1.0" }
-slabmalloc = { path = "../../../sys/lib/slabmalloc" }
 malloc = { path = "../../../sys/lib/malloc", version = "0.1.0" }
 rref = { path = "../../../sys/lib/rref", version = "0.1.0" }
 spin = { path = "../../../lib/spin-rs" }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ default-features = false`
`60`	`60`
`61`	`61`	`[features]`
`62`	`62`	`default = [`
`63`		`- # "nullnet",`
	`63`	`+ "nullnet",`
`64`	`64`	`]`
`65`	`65`
`66`	`66`	`nullnet = []`