Skip to content

Commit 59aed76

Browse files
committed
ci: fix compile errors
2 parents 337161c + 084e9c5 commit 59aed76

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

frontend/rust-lib/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/rust-lib/flowy-error/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bytes = "1.0"
1616
flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration", optional = true}
1717
lib-ot = { path = "../../../shared-lib/lib-ot", optional = true}
1818
serde_json = {version = "1.0", optional = true}
19-
http-response = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", optional = true}
19+
http-flowy = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", optional = true}
2020
flowy-database = { path = "../flowy-database", optional = true}
2121
r2d2 = { version = "0.8", optional = true}
2222
lib-sqlite = { path = "../lib-sqlite", optional = true }
@@ -25,5 +25,5 @@ lib-sqlite = { path = "../lib-sqlite", optional = true }
2525
collaboration = ["flowy-collaboration"]
2626
ot = ["lib-ot"]
2727
serde = ["serde_json"]
28-
http_server = ["http-response"]
28+
http_server = ["http-flowy"]
2929
db = ["flowy-database", "lib-sqlite", "r2d2"]

frontend/rust-lib/flowy-error/src/ext/http_server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::FlowyError;
22
use error_code::ErrorCode;
3-
use http_response::errors::{ErrorCode as ServerErrorCode, ServerError};
3+
use http_flowy::errors::{ErrorCode as ServerErrorCode, ServerError};
44

55
impl std::convert::From<ServerError> for FlowyError {
66
fn from(error: ServerError) -> Self {

frontend/rust-lib/flowy-net/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ tracing = { version = "0.1", features = ["log"] }
2929
dashmap = {version = "4.0"}
3030
async-stream = "0.3.2"
3131
futures-util = "0.3.15"
32-
http-response = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", features = ["with_reqwest"]}
32+
http-flowy = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", features = ["with_reqwest"] }
3333
serde-aux = "1.0.1"
3434
reqwest = "0.11"
3535
hyper = "0.14"

frontend/rust-lib/flowy-net/src/http_server/document.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
use flowy_collaboration::entities::document_info::{CreateDocParams, DocumentId, DocumentInfo, ResetDocumentParams};
66
use flowy_document::DocumentCloudService;
77
use flowy_error::FlowyError;
8-
use http_response::response::FlowyResponse;
8+
use http_flowy::response::FlowyResponse;
99
use lazy_static::lazy_static;
1010
use lib_infra::future::FutureResult;
1111
use std::sync::Arc;

frontend/rust-lib/flowy-net/src/http_server/folder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use flowy_folder_data_model::entities::{
1111
};
1212

1313
use flowy_folder::event_map::FolderCouldServiceV1;
14-
use http_response::errors::ServerError;
15-
use http_response::response::FlowyResponse;
14+
use http_flowy::errors::ServerError;
15+
use http_flowy::response::FlowyResponse;
1616
use lazy_static::lazy_static;
1717
use lib_infra::future::FutureResult;
1818
use std::sync::Arc;

frontend/rust-lib/flowy-net/src/http_server/user.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use flowy_user::event_map::UserCloudService;
44
use flowy_user_data_model::entities::{
55
SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile,
66
};
7-
use http_response::errors::ServerError;
7+
use http_flowy::errors::ServerError;
88
use lib_infra::future::FutureResult;
99

1010
pub struct UserHttpCloudService {

frontend/rust-lib/flowy-net/src/request.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::configuration::HEADER_TOKEN;
22
use bytes::Bytes;
3-
use http_response::errors::ServerError;
4-
use http_response::response::FlowyResponse;
3+
use http_flowy::errors::ServerError;
4+
use http_flowy::response::FlowyResponse;
55
use hyper::http;
66
use protobuf::ProtobufError;
77
use reqwest::{header::HeaderMap, Client, Method, Response};

frontend/scripts/makefile/desktop.toml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ private = true
3434
script = [
3535
"""
3636
cd rust-lib/
37+
rustup show
3738
echo cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
3839
cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
3940
cd ../

0 commit comments

Comments
 (0)