diff --git a/backend/rustfmt.toml b/backend/rustfmt.toml index 5a9925fc22..d76ec139c3 100644 --- a/backend/rustfmt.toml +++ b/backend/rustfmt.toml @@ -8,7 +8,7 @@ wrap_comments = true use_field_init_shorthand = true use_try_shorthand = true normalize_doc_attributes = true -report_todo = "Always" +report_todo = "Never" report_fixme = "Always" imports_layout = "HorizontalVertical" imports_granularity = "Crate" diff --git a/frontend/rust-lib/dart-ffi/src/protobuf/mod.rs b/frontend/rust-lib/dart-ffi/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/frontend/rust-lib/dart-ffi/src/protobuf/mod.rs +++ b/frontend/rust-lib/dart-ffi/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/frontend/rust-lib/dart-ffi/src/protobuf/model/mod.rs b/frontend/rust-lib/dart-ffi/src/protobuf/model/mod.rs index 8220f60f66..faa39cb5d8 100644 --- a/frontend/rust-lib/dart-ffi/src/protobuf/model/mod.rs +++ b/frontend/rust-lib/dart-ffi/src/protobuf/model/mod.rs @@ -1,7 +1,7 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod ffi_response; -pub use ffi_response::*; +mod ffi_response; +pub use ffi_response::*; -mod ffi_request; -pub use ffi_request::*; +mod ffi_request; +pub use ffi_request::*; diff --git a/frontend/rust-lib/dart-notify/src/protobuf/mod.rs b/frontend/rust-lib/dart-notify/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/frontend/rust-lib/dart-notify/src/protobuf/mod.rs +++ b/frontend/rust-lib/dart-notify/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/frontend/rust-lib/dart-notify/src/protobuf/model/mod.rs b/frontend/rust-lib/dart-notify/src/protobuf/model/mod.rs index ce50dd797d..41671a628b 100644 --- a/frontend/rust-lib/dart-notify/src/protobuf/model/mod.rs +++ b/frontend/rust-lib/dart-notify/src/protobuf/model/mod.rs @@ -1,4 +1,4 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod subject; -pub use subject::*; +mod subject; +pub use subject::*; diff --git a/frontend/rust-lib/flowy-document/src/protobuf/mod.rs b/frontend/rust-lib/flowy-document/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/frontend/rust-lib/flowy-document/src/protobuf/mod.rs +++ b/frontend/rust-lib/flowy-document/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/frontend/rust-lib/flowy-document/src/protobuf/model/mod.rs b/frontend/rust-lib/flowy-document/src/protobuf/model/mod.rs index 2dba0cd565..eef3973e6c 100644 --- a/frontend/rust-lib/flowy-document/src/protobuf/model/mod.rs +++ b/frontend/rust-lib/flowy-document/src/protobuf/model/mod.rs @@ -1,7 +1,7 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod observable; -pub use observable::*; +mod observable; +pub use observable::*; -mod errors; -pub use errors::*; +mod errors; +pub use errors::*; diff --git a/frontend/rust-lib/flowy-user/src/protobuf/mod.rs b/frontend/rust-lib/flowy-user/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/frontend/rust-lib/flowy-user/src/protobuf/mod.rs +++ b/frontend/rust-lib/flowy-user/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/frontend/rust-lib/flowy-user/src/protobuf/model/mod.rs b/frontend/rust-lib/flowy-user/src/protobuf/model/mod.rs index ca6e0867af..7c09f0b489 100644 --- a/frontend/rust-lib/flowy-user/src/protobuf/model/mod.rs +++ b/frontend/rust-lib/flowy-user/src/protobuf/model/mod.rs @@ -1,19 +1,19 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod observable; -pub use observable::*; +mod observable; +pub use observable::*; -mod user_table; -pub use user_table::*; +mod user_table; +pub use user_table::*; -mod errors; -pub use errors::*; +mod errors; +pub use errors::*; -mod user_profile; -pub use user_profile::*; +mod user_profile; +pub use user_profile::*; -mod event; -pub use event::*; +mod event; +pub use event::*; -mod auth; -pub use auth::*; +mod auth; +pub use auth::*; diff --git a/frontend/rust-lib/flowy-workspace/src/protobuf/mod.rs b/frontend/rust-lib/flowy-workspace/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/frontend/rust-lib/flowy-workspace/src/protobuf/mod.rs +++ b/frontend/rust-lib/flowy-workspace/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/frontend/rust-lib/flowy-workspace/src/protobuf/model/mod.rs b/frontend/rust-lib/flowy-workspace/src/protobuf/model/mod.rs index 35cbf4e069..9a1a9baace 100644 --- a/frontend/rust-lib/flowy-workspace/src/protobuf/model/mod.rs +++ b/frontend/rust-lib/flowy-workspace/src/protobuf/model/mod.rs @@ -1,10 +1,10 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod observable; -pub use observable::*; +mod observable; +pub use observable::*; -mod errors; -pub use errors::*; +mod errors; +pub use errors::*; -mod event; -pub use event::*; +mod event; +pub use event::*; diff --git a/frontend/rust-lib/flowy-workspace/src/services/trash_can.rs b/frontend/rust-lib/flowy-workspace/src/services/trash_can.rs index 6cbe53aef5..716966a0d9 100644 --- a/frontend/rust-lib/flowy-workspace/src/services/trash_can.rs +++ b/frontend/rust-lib/flowy-workspace/src/services/trash_can.rs @@ -245,8 +245,6 @@ impl TrashCan { match result { Ok(repeated_trash) => { - // FIXME: User may modify the trash(add/putback) before the flying request comes - // back that will cause the trash list to be outdated. notify_trash_changed(repeated_trash); }, Err(e) => log::error!("Save trash failed: {:?}", e), diff --git a/frontend/rust-lib/lib-infra/src/protobuf/mod.rs b/frontend/rust-lib/lib-infra/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/frontend/rust-lib/lib-infra/src/protobuf/mod.rs +++ b/frontend/rust-lib/lib-infra/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/frontend/rust-lib/lib-infra/src/protobuf/model/mod.rs b/frontend/rust-lib/lib-infra/src/protobuf/model/mod.rs index b481acecd1..fac22cac7e 100644 --- a/frontend/rust-lib/lib-infra/src/protobuf/model/mod.rs +++ b/frontend/rust-lib/lib-infra/src/protobuf/model/mod.rs @@ -1,4 +1,4 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod kv; -pub use kv::*; +mod kv; +pub use kv::*; diff --git a/frontend/rust-lib/lib-infra/src/retry/strategy/jitter.rs b/frontend/rust-lib/lib-infra/src/retry/strategy/jitter.rs index c11ae8ed87..edd1a2697e 100644 --- a/frontend/rust-lib/lib-infra/src/retry/strategy/jitter.rs +++ b/frontend/rust-lib/lib-infra/src/retry/strategy/jitter.rs @@ -1,5 +1,3 @@ use std::time::Duration; -pub fn jitter(duration: Duration) -> Duration { - duration.mul_f64(rand::random::()) -} +pub fn jitter(duration: Duration) -> Duration { duration.mul_f64(rand::random::()) } diff --git a/frontend/rust-lib/rustfmt.toml b/frontend/rust-lib/rustfmt.toml index 5a9925fc22..d76ec139c3 100644 --- a/frontend/rust-lib/rustfmt.toml +++ b/frontend/rust-lib/rustfmt.toml @@ -8,7 +8,7 @@ wrap_comments = true use_field_init_shorthand = true use_try_shorthand = true normalize_doc_attributes = true -report_todo = "Always" +report_todo = "Never" report_fixme = "Always" imports_layout = "HorizontalVertical" imports_granularity = "Crate" diff --git a/frontend/scripts/flowy-tool/src/proto/proto_gen.rs b/frontend/scripts/flowy-tool/src/proto/proto_gen.rs index 05f3d791ce..472ec0d5a7 100644 --- a/frontend/scripts/flowy-tool/src/proto/proto_gen.rs +++ b/frontend/scripts/flowy-tool/src/proto/proto_gen.rs @@ -15,12 +15,12 @@ impl ProtoGen { let crate_proto_infos = parse_crate_protobuf(self.rust_source_dirs.clone()); write_proto_files(&crate_proto_infos); - // FIXME: ignore unchanged file to reduce time cost + // TODO: ignore unchanged file to reduce time cost run_rust_protoc(&crate_proto_infos); write_rust_crate_mod_file(&crate_proto_infos); write_derive_meta(&crate_proto_infos, self.derive_meta_dir.as_ref()); - // FIXME: ignore unchanged file to reduce time cost + // TODO: ignore unchanged file to reduce time cost let flutter_package = FlutterProtobufInfo::new(self.flutter_package_lib.as_ref()); run_flutter_protoc(&crate_proto_infos, &flutter_package); write_flutter_protobuf_package_mod_file(&crate_proto_infos, &flutter_package); diff --git a/shared-lib/flowy-document-infra/src/protobuf/mod.rs b/shared-lib/flowy-document-infra/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/shared-lib/flowy-document-infra/src/protobuf/mod.rs +++ b/shared-lib/flowy-document-infra/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/shared-lib/flowy-document-infra/src/protobuf/model/mod.rs b/shared-lib/flowy-document-infra/src/protobuf/model/mod.rs index 35930ca067..7e48342c5b 100644 --- a/shared-lib/flowy-document-infra/src/protobuf/model/mod.rs +++ b/shared-lib/flowy-document-infra/src/protobuf/model/mod.rs @@ -1,10 +1,10 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod ws; -pub use ws::*; +mod ws; +pub use ws::*; -mod revision; -pub use revision::*; +mod revision; +pub use revision::*; -mod doc; -pub use doc::*; +mod doc; +pub use doc::*; diff --git a/shared-lib/flowy-user-infra/src/protobuf/mod.rs b/shared-lib/flowy-user-infra/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/shared-lib/flowy-user-infra/src/protobuf/mod.rs +++ b/shared-lib/flowy-user-infra/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/shared-lib/flowy-user-infra/src/protobuf/model/mod.rs b/shared-lib/flowy-user-infra/src/protobuf/model/mod.rs index 2a87900a41..37765fa03a 100644 --- a/shared-lib/flowy-user-infra/src/protobuf/model/mod.rs +++ b/shared-lib/flowy-user-infra/src/protobuf/model/mod.rs @@ -1,10 +1,10 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod errors; -pub use errors::*; +mod errors; +pub use errors::*; -mod user_profile; -pub use user_profile::*; +mod user_profile; +pub use user_profile::*; -mod auth; -pub use auth::*; +mod auth; +pub use auth::*; diff --git a/shared-lib/flowy-user-infra/src/user_default.rs b/shared-lib/flowy-user-infra/src/user_default.rs index e69de29bb2..8b13789179 100644 --- a/shared-lib/flowy-user-infra/src/user_default.rs +++ b/shared-lib/flowy-user-infra/src/user_default.rs @@ -0,0 +1 @@ + diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/mod.rs b/shared-lib/flowy-workspace-infra/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/shared-lib/flowy-workspace-infra/src/protobuf/mod.rs +++ b/shared-lib/flowy-workspace-infra/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs b/shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs index 43d0c350ae..0e06814754 100644 --- a/shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs +++ b/shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs @@ -1,40 +1,40 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod view_update; -pub use view_update::*; +mod view_update; +pub use view_update::*; -mod workspace_setting; -pub use workspace_setting::*; +mod workspace_setting; +pub use workspace_setting::*; -mod app_query; -pub use app_query::*; +mod app_query; +pub use app_query::*; -mod errors; -pub use errors::*; +mod errors; +pub use errors::*; -mod workspace_update; -pub use workspace_update::*; +mod workspace_update; +pub use workspace_update::*; -mod app_create; -pub use app_create::*; +mod app_create; +pub use app_create::*; -mod workspace_query; -pub use workspace_query::*; +mod workspace_query; +pub use workspace_query::*; -mod view_create; -pub use view_create::*; +mod view_create; +pub use view_create::*; -mod workspace_create; -pub use workspace_create::*; +mod workspace_create; +pub use workspace_create::*; -mod app_update; -pub use app_update::*; +mod app_update; +pub use app_update::*; -mod view_query; -pub use view_query::*; +mod view_query; +pub use view_query::*; -mod trash_create; -pub use trash_create::*; +mod trash_create; +pub use trash_create::*; -mod export; -pub use export::*; +mod export; +pub use export::*; diff --git a/shared-lib/lib-ws/src/protobuf/mod.rs b/shared-lib/lib-ws/src/protobuf/mod.rs index 2480f62fbe..8177ff8614 100644 --- a/shared-lib/lib-ws/src/protobuf/mod.rs +++ b/shared-lib/lib-ws/src/protobuf/mod.rs @@ -1,4 +1,2 @@ - mod model; pub use model::*; - \ No newline at end of file diff --git a/shared-lib/lib-ws/src/protobuf/model/mod.rs b/shared-lib/lib-ws/src/protobuf/model/mod.rs index e082345eb3..39ad86f50d 100644 --- a/shared-lib/lib-ws/src/protobuf/model/mod.rs +++ b/shared-lib/lib-ws/src/protobuf/model/mod.rs @@ -1,7 +1,7 @@ -// Auto-generated, do not edit +// Auto-generated, do not edit -mod errors; -pub use errors::*; +mod errors; +pub use errors::*; -mod msg; -pub use msg::*; +mod msg; +pub use msg::*; diff --git a/shared-lib/rust-toolchain b/shared-lib/rust-toolchain index e6fe48400e..c02a427532 100644 --- a/shared-lib/rust-toolchain +++ b/shared-lib/rust-toolchain @@ -1,4 +1,3 @@ [toolchain] #rustup override set nightly-2021-04-24 -channel = "nightly-2021-04-24" -targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", "aarch64-apple-ios", "x86_64-apple-ios" ] \ No newline at end of file +channel = "nightly-2021-04-24" \ No newline at end of file diff --git a/shared-lib/rustfmt.toml b/shared-lib/rustfmt.toml index 5a9925fc22..d76ec139c3 100644 --- a/shared-lib/rustfmt.toml +++ b/shared-lib/rustfmt.toml @@ -8,7 +8,7 @@ wrap_comments = true use_field_init_shorthand = true use_try_shorthand = true normalize_doc_attributes = true -report_todo = "Always" +report_todo = "Never" report_fixme = "Always" imports_layout = "HorizontalVertical" imports_granularity = "Crate"