Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

solver conflicts

Browse Source
This commit is contained in:
appflowy
2022-01-24 17:32:40 +08:00
parent 8fa3590661 24c1817c8d
commit a9eec5baed
426 changed files with 22160 additions and 16593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/rust-lib/flowy-error/src/ext/collaborate.rs
View File

@ -1,7 +1,12 @@
use crate::FlowyError;
use flowy_collaboration::errors::ErrorCode;
impl std::convert::From<flowy_collaboration::errors::CollaborateError> for FlowyError {
fn from(error: flowy_collaboration::errors::CollaborateError) -> Self {
FlowyError::internal().context(error)
match error.code {
ErrorCode::RecordNotFound => FlowyError::record_not_found().context(error.msg),
_ => FlowyError::internal().context(error.msg),
}
}
}

4
frontend/rust-lib/flowy-error/src/ext/ot.rs
View File

@ -1,7 +1,5 @@
use crate::FlowyError;
impl std::convert::From<lib_ot::errors::OTError> for FlowyError {
fn from(error: lib_ot::errors::OTError) -> Self {
FlowyError::internal().context(error)
}
fn from(error: lib_ot::errors::OTError) -> Self { FlowyError::internal().context(error.msg) }
}