From ac584fb7efd6d98e9c80ef29a1a703c40b0d09e5 Mon Sep 17 00:00:00 2001 From: appflowy Date: Mon, 11 Apr 2022 20:58:56 +0800 Subject: [PATCH] chore: fix warnings --- .../presentation/plugins/grid/src/grid_page.dart | 1 - .../services/field/type_options/date_type_option.rs | 11 +++++------ .../services/field/type_options/text_type_option.rs | 4 ---- .../flowy-folder-data-model/src/user_default.rs | 6 +++--- shared-lib/flowy-grid-data-model/tests/serde_test.rs | 11 ----------- 5 files changed, 8 insertions(+), 25 deletions(-) diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart index 4e0416fb2f..6f6878c515 100755 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart @@ -5,7 +5,6 @@ import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart'; import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart'; import 'package:flowy_infra_ui/style_widget/scrolling/styled_scrollview.dart'; import 'package:flowy_infra_ui/widget/error_page.dart'; -import 'package:flowy_sdk/log.dart'; import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart' show Field; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option.rs index ccb4cc36d0..2c9ab7c40e 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option.rs @@ -190,11 +190,10 @@ impl std::default::Default for TimeFormat { #[cfg(test)] mod tests { + use crate::services::field::DateTypeOption; use crate::services::field::FieldBuilder; - use crate::services::field::{DateFormat, DateTypeOption, TimeFormat}; - use crate::services::row::{CellDataOperation, TypeOptionCellData}; + use crate::services::row::CellDataOperation; use flowy_grid_data_model::entities::FieldType; - use strum::IntoEnumIterator; #[test] fn date_description_invalid_input_test() { @@ -287,7 +286,7 @@ mod tests { type_option.apply_changeset("he", None).unwrap(); } - fn data(s: &str) -> String { - TypeOptionCellData::new(s, FieldType::DateTime).json() - } + // fn data(s: &str) -> String { + // TypeOptionCellData::new(s, FieldType::DateTime).json() + // } } diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option.rs index cf2c42e8c9..38ea9d5e78 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option.rs @@ -65,10 +65,6 @@ impl CellDataOperation for RichTextTypeOption { #[cfg(test)] mod tests { - use crate::services::field::FieldBuilder; - use crate::services::field::*; - use crate::services::row::{CellDataOperation, TypeOptionCellData}; - use flowy_grid_data_model::entities::FieldType; // #[test] // fn text_description_test() { diff --git a/shared-lib/flowy-folder-data-model/src/user_default.rs b/shared-lib/flowy-folder-data-model/src/user_default.rs index bb3c3ea560..ed56d2d80a 100644 --- a/shared-lib/flowy-folder-data-model/src/user_default.rs +++ b/shared-lib/flowy-folder-data-model/src/user_default.rs @@ -19,7 +19,7 @@ pub fn create_default_workspace() -> Workspace { }; Workspace { - id: workspace_id.to_string(), + id: workspace_id, name, desc, apps, @@ -38,7 +38,7 @@ fn create_default_app(workspace_id: String, time: chrono::DateTime) -> App }; App { - id: app_id.to_string(), + id: app_id, workspace_id, name, desc, @@ -56,7 +56,7 @@ fn create_default_view(app_id: String, time: chrono::DateTime) -> View { let data_type = ViewDataType::TextBlock; View { - id: view_id.to_string(), + id: view_id, belong_to_id: app_id, name, desc, diff --git a/shared-lib/flowy-grid-data-model/tests/serde_test.rs b/shared-lib/flowy-grid-data-model/tests/serde_test.rs index 2bae3f6a79..22d4b92a6d 100644 --- a/shared-lib/flowy-grid-data-model/tests/serde_test.rs +++ b/shared-lib/flowy-grid-data-model/tests/serde_test.rs @@ -12,14 +12,3 @@ fn grid_default_serde_test() { let json = serde_json::to_string(&grid).unwrap(); assert_eq!(json, r#"{"grid_id":"1","fields":[],"blocks":[]}"#) } - -fn create_field(field_id: &str) -> FieldMeta { - let mut field = FieldMeta::new("Text Field", "", FieldType::RichText); - field.id = field_id.to_string(); - field -} - -#[allow(dead_code)] -fn uuid() -> String { - uuid::Uuid::new_v4().to_string() -}