Merge branch 'main' into release/0.3.1

LucasXu0 · Sep 4, 2023 · ff454bc · ff454bc
2 parents 03a14f5 + a821740
commit ff454bc
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 32 deletions.
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
diff --git a/frontend/rust-lib/flowy-error/Cargo.toml b/frontend/rust-lib/flowy-error/Cargo.toml
@@ -17,7 +17,6 @@ serde_json = {version = "1.0", optional = true}
 serde_repr = { version = "0.1" }
 serde = "1.0"
 reqwest = { version = "0.11.14", optional = true, features = ["native-tls-vendored"] }
-http-error-code = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", branch = "refactor/appflowy_server", optional = true }
 flowy-sqlite = { path = "../flowy-sqlite", optional = true}
 r2d2 = { version = "0.8", optional = true}
 url = { version = "2.2", optional = true }
@@ -31,7 +30,6 @@ impl_from_dispatch_error = ["lib-dispatch"]
 impl_from_serde = ["serde_json"]
 impl_from_reqwest = ["reqwest"]
 impl_from_sqlite = ["flowy-sqlite", "r2d2"]
-impl_from_appflowy_cloud = ["http-error-code"]
 impl_from_collab = ["collab-database", "collab-document", "impl_from_reqwest"]
 impl_from_postgres = ["tokio-postgres"]
 impl_from_tokio= ["tokio"]

diff --git a/frontend/rust-lib/flowy-error/src/impl_from/http_server.rs b/frontend/rust-lib/flowy-error/src/impl_from/http_server.rs
diff --git a/frontend/rust-lib/flowy-error/src/impl_from/mod.rs b/frontend/rust-lib/flowy-error/src/impl_from/mod.rs
@@ -13,9 +13,6 @@ pub mod reqwest;
 #[cfg(feature = "impl_from_sqlite")]
 pub mod database;
 
-#[cfg(feature = "impl_from_appflowy_cloud")]
-pub mod http_server;
-
 #[cfg(feature = "impl_from_collab")]
 pub mod collab;