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

chore: support Rust 1.75 (#4246)

Browse Source 
* chore: fix wanrings

* chore: update rust version
This commit is contained in:
Nathan.fooo
2023-12-30 01:22:06 +08:00
committed by GitHub
parent 206ccb2c43
commit 50694bb589
31 changed files with 42 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs
View File

@ -1304,12 +1304,7 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {
if let (Some(database), Some(editor_by_view_id)) =
(weak_database.upgrade(), weak_editor_by_view_id.upgrade())
{
let view_editors = editor_by_view_id
.read()
.await
.values()
.map(|editor| editor.clone())
.collect();
let view_editors = editor_by_view_id.read().await.values().cloned().collect();
let _ =
update_field_type_option_fn(&database, &view_editors, type_option_data, old_field).await;
}

1
frontend/rust-lib/flowy-database2/src/services/field/type_options/selection_type_option/mod.rs
View File

@ -7,7 +7,6 @@ mod select_type_option;
mod single_select_type_option;
mod type_option_transform;
pub use checklist_filter::*;
pub use multi_select_type_option::*;
pub use select_ids::*;
pub use select_option::*;

2
frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rs
View File

@ -280,6 +280,6 @@ pub fn default_type_option_data_from_type(field_type: &FieldType) -> TypeOptionD
FieldType::MultiSelect => MultiSelectTypeOption::default().into(),
FieldType::Checkbox => CheckboxTypeOption::default().into(),
FieldType::URL => URLTypeOption::default().into(),
FieldType::Checklist => ChecklistTypeOption::default().into(),
FieldType::Checklist => ChecklistTypeOption.into(),
}
}

4
frontend/rust-lib/flowy-database2/src/services/filter/controller.rs
View File

@ -369,9 +369,7 @@ fn filter_row(
cell_filter_cache: &CellFilterCache,
) -> Option<(RowId, bool)> {
// Create a filter result cache if it's not exist
let mut filter_result = result_by_row_id
.entry(row.id.clone())
.or_insert_with(FilterResult::default);
let mut filter_result = result_by_row_id.entry(row.id.clone()).or_default();
let old_is_visible = filter_result.is_visible();
// Iterate each cell of the row to check its visibility

4
frontend/rust-lib/flowy-database2/src/services/group/controller.rs
View File

@ -115,14 +115,14 @@ where
let no_status_group_rows = other_group_changesets
.iter()
.flat_map(|changeset| &changeset.deleted_rows)
.cloned()
.filter(|row_id| {
.filter(|&row_id| {
// if the [other_group_inserted_row] contains the row_id of the row
// which means the row should not move to the default group.
!other_group_inserted_row
.iter()
.any(|inserted_row| &inserted_row.row_meta.id == row_id)
})
.cloned()
.collect::<Vec<String>>();
let mut changeset = GroupRowsNotificationPB::new(no_status_group.id.clone());

6
frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs
View File

@ -223,10 +223,8 @@ impl GroupCustomize for DateGroupController {
deleted_group = Some(GroupPB::from(group.clone()));
}
}
if deleted_group.is_some() {
let _ = self
.context
.delete_group(&deleted_group.as_ref().unwrap().group_id);
if let Some(delete_group) = deleted_group.as_ref() {
let _ = self.context.delete_group(&delete_group.group_id);
}
deleted_group
}

6
frontend/rust-lib/flowy-database2/src/services/group/controller_impls/url_controller.rs
View File

@ -179,10 +179,8 @@ impl GroupCustomize for URLGroupController {
deleted_group = Some(GroupPB::from(group.clone()));
}
}
if deleted_group.is_some() {
let _ = self
.context
.delete_group(&deleted_group.as_ref().unwrap().group_id);
if let Some(deleted_group) = deleted_group.as_ref() {
let _ = self.context.delete_group(&deleted_group.group_id);
}
deleted_group
}

7
frontend/rust-lib/flowy-database2/src/services/sort/entities.rs
View File

@ -30,9 +30,10 @@ impl TryFrom<SortMap> for Sort {
value.get_i64_value(FIELD_TYPE).map(FieldType::from),
) {
(Some(id), Some(field_id), Some(field_type)) => {
let condition =
SortCondition::try_from(value.get_i64_value(SORT_CONDITION).unwrap_or_default())
.unwrap_or_default();
let condition = value
.get_i64_value(SORT_CONDITION)
.map(SortCondition::from)
.unwrap_or_default();
Ok(Self {
id,
field_id,

2
frontend/rust-lib/flowy-database2/tests/database/cell_test/test.rs
View File

@ -19,7 +19,7 @@ async fn grid_cell_update() {
let rows = &test.row_details;
let mut scripts = vec![];
for (_, row_detail) in rows.iter().enumerate() {
for row_detail in rows.iter() {
for field in &fields {
let field_type = FieldType::from(field.field_type);
if field_type == FieldType::LastEditedTime || field_type == FieldType::CreatedTime {

2
frontend/rust-lib/flowy-database2/tests/database/field_test/test.rs
View File

@ -195,7 +195,7 @@ async fn grid_switch_from_multi_select_to_text_test() {
from_field_type: FieldType::MultiSelect,
expected_content: format!(
"{},{}",
multi_select_type_option.get(0).unwrap().name,
multi_select_type_option.first().unwrap().name,
multi_select_type_option.get(1).unwrap().name
),
}];

2
frontend/rust-lib/flowy-database2/tests/database/group_test/date_group_test.rs
View File

@ -196,7 +196,7 @@ async fn change_date_on_moving_row_to_another_group() {
let group = test.group_at_index(2).await;
let rows = group.clone().rows;
let row_id = &rows.get(0).unwrap().id;
let row_id = &rows.first().unwrap().id;
let row_detail = test
.get_rows()
.await

12
frontend/rust-lib/flowy-database2/tests/database/group_test/test.rs
View File

@ -47,7 +47,7 @@ async fn group_move_row_test() {
AssertRow {
group_index: 1,
row_index: 1,
row: group.rows.get(0).unwrap().clone(),
row: group.rows.first().unwrap().clone(),
},
];
test.run_scripts(scripts).await;
@ -75,7 +75,7 @@ async fn group_move_row_to_other_group_test() {
AssertRow {
group_index: 2,
row_index: 1,
row: group.rows.get(0).unwrap().clone(),
row: group.rows.first().unwrap().clone(),
},
];
test.run_scripts(scripts).await;
@ -104,7 +104,7 @@ async fn group_move_two_row_to_other_group_test() {
AssertRow {
group_index: 2,
row_index: 1,
row: group_1.rows.get(0).unwrap().clone(),
row: group_1.rows.first().unwrap().clone(),
},
];
test.run_scripts(scripts).await;
@ -129,7 +129,7 @@ async fn group_move_two_row_to_other_group_test() {
AssertRow {
group_index: 2,
row_index: 1,
row: group_1.rows.get(0).unwrap().clone(),
row: group_1.rows.first().unwrap().clone(),
},
];
test.run_scripts(scripts).await;
@ -150,7 +150,7 @@ async fn group_move_row_to_other_group_and_reorder_from_up_to_down_test() {
AssertRow {
group_index: 2,
row_index: 1,
row: group_1.rows.get(0).unwrap().clone(),
row: group_1.rows.first().unwrap().clone(),
},
];
test.run_scripts(scripts).await;
@ -165,7 +165,7 @@ async fn group_move_row_to_other_group_and_reorder_from_up_to_down_test() {
AssertRow {
group_index: 2,
row_index: 2,
row: group_2.rows.get(0).unwrap().clone(),
row: group_2.rows.first().unwrap().clone(),
},
];
test.run_scripts(scripts).await;

2
frontend/rust-lib/flowy-database2/tests/database/mock_data/board_mock_data.rs
View File

@ -118,7 +118,7 @@ pub fn make_test_board() -> DatabaseData {
// let option1 = SelectOption::with_color(FIRST_THING, SelectOptionColor::Purple);
// let option2 = SelectOption::with_color(SECOND_THING, SelectOptionColor::Orange);
// let option3 = SelectOption::with_color(THIRD_THING, SelectOptionColor::Yellow);
let type_option = ChecklistTypeOption::default();
let type_option = ChecklistTypeOption;
// type_option.options.extend(vec![option1, option2, option3]);
let checklist_field = FieldBuilder::new(field_type, type_option)
.name("TODO")

2
frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs
View File

@ -120,7 +120,7 @@ pub fn make_test_grid() -> DatabaseData {
// let option1 = SelectOption::with_color(FIRST_THING, SelectOptionColor::Purple);
// let option2 = SelectOption::with_color(SECOND_THING, SelectOptionColor::Orange);
// let option3 = SelectOption::with_color(THIRD_THING, SelectOptionColor::Yellow);
let type_option = ChecklistTypeOption::default();
let type_option = ChecklistTypeOption;
// type_option.options.extend(vec![option1, option2, option3]);
let checklist_field = FieldBuilder::new(field_type, type_option)
.name("TODO")