error: merge crate nydus-error into nydus-utils and nydus-api

Merge crate nydus-error into nydus-utils and nydus-api, to reduce number of crates. Signed-off-by: Jiang Liu <[email protected]>
dragonflyoss · May 23, 2023 · 57c7ac2 · 57c7ac2
1 parent 809f8d9
commit 57c7ac2
Show file tree

Hide file tree

Showing 27 changed files with 178 additions and 435 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,6 @@ openssl = { version = "0.10.48", features = ["vendored"] }
 #openssl-src = { version = "111.22" }
 
 nydus-api = { version = "0.2.2", path = "api", features = ["handler"] }
-nydus-error = { version = "0.2.3", path = "error" }
 nydus-rafs = { version = "0.2.2", path = "rafs", features = ["builder"] }
 nydus-service = { version = "0.2.0", path = "service", features = ["block-device"] }
 nydus-storage = { version = "0.6.2", path = "storage" }
@@ -106,4 +105,4 @@ backend-registry = ["nydus-storage/backend-registry"]
 backend-s3 = ["nydus-storage/backend-s3"]
 
 [workspace]
-members = ["api", "clib", "error", "rafs", "storage", "service", "utils"]
+members = ["api", "clib", "rafs", "storage", "service", "utils"]
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/dragonflyoss/image-service"
 edition = "2018"
 
 [dependencies]
+backtrace = "0.3"
 dbs-uhttp = { version = "0.3.0", optional = true }
 http = { version = "0.2.1", optional = true }
 lazy_static = { version = "1.4.0", optional = true }
@@ -20,8 +21,6 @@ serde_json = "1.0.53"
 toml = "0.5"
 url = { version = "2.1.1", optional = true }
 
-nydus-error = { version = "0.2", path = "../error" }
-
 [dev-dependencies]
 vmm-sys-util = { version = "0.10" }