chore: upgrade rust version to 1.70 (#2749)

* chore: upgrade rust version to 1.70

* ci: fix wanrings

* ci: fix clippy warings
This commit is contained in:
Nathan.fooo
2023-06-09 22:23:07 +08:00
committed by GitHub
parent 133ac72317
commit ab5a3dae3c
57 changed files with 102 additions and 263 deletions

View File

@ -475,7 +475,9 @@ pub struct FieldChangesetParams {
Deserialize_repr,
)]
#[repr(u8)]
#[derive(Default)]
pub enum FieldType {
#[default]
RichText = 0,
Number = 1,
DateTime = 2,
@ -488,12 +490,6 @@ pub enum FieldType {
CreatedTime = 9,
}
impl std::default::Default for FieldType {
fn default() -> Self {
FieldType::RichText
}
}
impl Display for FieldType {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
let value: i64 = self.clone().into();

View File

@ -10,7 +10,9 @@ pub struct CheckboxFilterPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum CheckboxFilterConditionPB {
#[default]
IsChecked = 0,
IsUnChecked = 1,
}
@ -21,12 +23,6 @@ impl std::convert::From<CheckboxFilterConditionPB> for u32 {
}
}
impl std::default::Default for CheckboxFilterConditionPB {
fn default() -> Self {
CheckboxFilterConditionPB::IsChecked
}
}
impl std::convert::TryFrom<u8> for CheckboxFilterConditionPB {
type Error = ErrorCode;

View File

@ -10,8 +10,10 @@ pub struct ChecklistFilterPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum ChecklistFilterConditionPB {
IsComplete = 0,
#[default]
IsIncomplete = 1,
}
@ -21,12 +23,6 @@ impl std::convert::From<ChecklistFilterConditionPB> for u32 {
}
}
impl std::default::Default for ChecklistFilterConditionPB {
fn default() -> Self {
ChecklistFilterConditionPB::IsIncomplete
}
}
impl std::convert::TryFrom<u8> for ChecklistFilterConditionPB {
type Error = ErrorCode;

View File

@ -42,7 +42,9 @@ impl FromStr for DateFilterContentPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum DateFilterConditionPB {
#[default]
DateIs = 0,
DateBefore = 1,
DateAfter = 2,
@ -58,11 +60,6 @@ impl std::convert::From<DateFilterConditionPB> for u32 {
value as u32
}
}
impl std::default::Default for DateFilterConditionPB {
fn default() -> Self {
DateFilterConditionPB::DateIs
}
}
impl std::convert::TryFrom<u8> for DateFilterConditionPB {
type Error = ErrorCode;

View File

@ -13,7 +13,9 @@ pub struct NumberFilterPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum NumberFilterConditionPB {
#[default]
Equal = 0,
NotEqual = 1,
GreaterThan = 2,
@ -24,12 +26,6 @@ pub enum NumberFilterConditionPB {
NumberIsNotEmpty = 7,
}
impl std::default::Default for NumberFilterConditionPB {
fn default() -> Self {
NumberFilterConditionPB::Equal
}
}
impl std::convert::From<NumberFilterConditionPB> for u32 {
fn from(value: NumberFilterConditionPB) -> Self {
value as u32

View File

@ -14,7 +14,9 @@ pub struct SelectOptionFilterPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum SelectOptionConditionPB {
#[default]
OptionIs = 0,
OptionIsNot = 1,
OptionIsEmpty = 2,
@ -27,12 +29,6 @@ impl std::convert::From<SelectOptionConditionPB> for u32 {
}
}
impl std::default::Default for SelectOptionConditionPB {
fn default() -> Self {
SelectOptionConditionPB::OptionIs
}
}
impl std::convert::TryFrom<u8> for SelectOptionConditionPB {
type Error = ErrorCode;

View File

@ -13,7 +13,9 @@ pub struct TextFilterPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum TextFilterConditionPB {
#[default]
Is = 0,
IsNot = 1,
Contains = 2,
@ -30,12 +32,6 @@ impl std::convert::From<TextFilterConditionPB> for u32 {
}
}
impl std::default::Default for TextFilterConditionPB {
fn default() -> Self {
TextFilterConditionPB::Is
}
}
impl std::convert::TryFrom<u8> for TextFilterConditionPB {
type Error = ErrorCode;

View File

@ -54,7 +54,9 @@ pub struct DateGroupConfigurationPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
#[repr(u8)]
#[derive(Default)]
pub enum DateCondition {
#[default]
Relative = 0,
Day = 1,
Week = 2,
@ -62,12 +64,6 @@ pub enum DateCondition {
Year = 4,
}
impl std::default::Default for DateCondition {
fn default() -> Self {
DateCondition::Relative
}
}
#[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]
pub struct CheckboxGroupConfigurationPB {
#[pb(index = 1)]

View File

@ -35,18 +35,14 @@ pub struct DatabaseViewSettingPB {
#[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum, EnumIter)]
#[repr(u8)]
#[derive(Default)]
pub enum DatabaseLayoutPB {
#[default]
Grid = 0,
Board = 1,
Calendar = 2,
}
impl std::default::Default for DatabaseLayoutPB {
fn default() -> Self {
DatabaseLayoutPB::Grid
}
}
impl std::convert::From<DatabaseLayout> for DatabaseLayoutPB {
fn from(rev: DatabaseLayout) -> Self {
match rev {

View File

@ -1,16 +1,11 @@
use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
#[derive(Debug, ProtoBuf_Enum, Clone)]
#[derive(Debug, ProtoBuf_Enum, Clone, Default)]
pub enum DatabaseExportDataType {
#[default]
CSV = 0,
}
impl Default for DatabaseExportDataType {
fn default() -> Self {
DatabaseExportDataType::CSV
}
}
#[derive(Debug, ProtoBuf, Default, Clone)]
pub struct DatabaseExportDataPB {
#[pb(index = 1)]

View File

@ -75,19 +75,15 @@ impl From<DateTypeOptionPB> for DateTypeOption {
}
}
#[derive(Clone, Debug, Copy, EnumIter, ProtoBuf_Enum)]
#[derive(Clone, Debug, Copy, EnumIter, ProtoBuf_Enum, Default)]
pub enum DateFormatPB {
Local = 0,
US = 1,
ISO = 2,
#[default]
Friendly = 3,
DayMonthYear = 4,
}
impl std::default::Default for DateFormatPB {
fn default() -> Self {
DateFormatPB::Friendly
}
}
impl From<DateFormatPB> for DateFormat {
fn from(data: DateFormatPB) -> Self {
@ -113,18 +109,13 @@ impl From<DateFormat> for DateFormatPB {
}
}
#[derive(Clone, Copy, PartialEq, Eq, EnumIter, Debug, Hash, ProtoBuf_Enum)]
#[derive(Clone, Copy, PartialEq, Eq, EnumIter, Debug, Hash, ProtoBuf_Enum, Default)]
pub enum TimeFormatPB {
TwelveHour = 0,
#[default]
TwentyFourHour = 1,
}
impl std::default::Default for TimeFormatPB {
fn default() -> Self {
TimeFormatPB::TwentyFourHour
}
}
impl From<TimeFormatPB> for TimeFormat {
fn from(data: TimeFormatPB) -> Self {
match data {

View File

@ -39,8 +39,9 @@ impl From<NumberTypeOptionPB> for NumberTypeOption {
}
}
#[derive(Clone, Copy, Debug, ProtoBuf_Enum)]
#[derive(Clone, Copy, Debug, ProtoBuf_Enum, Default)]
pub enum NumberFormatPB {
#[default]
Num = 0,
USD = 1,
CanadianDollar = 2,
@ -79,12 +80,6 @@ pub enum NumberFormatPB {
Percent = 36,
}
impl std::default::Default for NumberFormatPB {
fn default() -> Self {
NumberFormatPB::Num
}
}
impl From<NumberFormat> for NumberFormatPB {
fn from(data: NumberFormat) -> Self {
match data {

View File

@ -57,7 +57,9 @@ pub struct RepeatedSelectOptionPayload {
#[derive(ProtoBuf_Enum, PartialEq, Eq, Debug, Clone)]
#[repr(u8)]
#[derive(Default)]
pub enum SelectOptionColorPB {
#[default]
Purple = 0,
Pink = 1,
LightPink = 2,
@ -69,12 +71,6 @@ pub enum SelectOptionColorPB {
Blue = 8,
}
impl std::default::Default for SelectOptionColorPB {
fn default() -> Self {
SelectOptionColorPB::Purple
}
}
impl From<SelectOptionColor> for SelectOptionColorPB {
fn from(data: SelectOptionColor) -> Self {
match data {

View File

@ -3,8 +3,9 @@ use flowy_notification::NotificationBuilder;
const OBSERVABLE_CATEGORY: &str = "Grid";
#[derive(ProtoBuf_Enum, Debug)]
#[derive(ProtoBuf_Enum, Debug, Default)]
pub enum DatabaseNotification {
#[default]
Unknown = 0,
/// Trigger after inserting/deleting/updating a row
DidUpdateViewRows = 20,
@ -44,12 +45,6 @@ pub enum DatabaseNotification {
DidMoveDatabaseViewToTrash = 84,
}
impl std::default::Default for DatabaseNotification {
fn default() -> Self {
DatabaseNotification::Unknown
}
}
impl std::convert::From<DatabaseNotification> for i32 {
fn from(notification: DatabaseNotification) -> Self {
notification as i32

View File

@ -1059,8 +1059,8 @@ fn cell_changesets_from_cell_by_field_id(
) -> Vec<CellChangesetNotifyPB> {
let row_id = row_id.into_inner();
cell_by_field_id
.into_iter()
.map(|(field_id, _cell)| CellChangesetNotifyPB {
.into_keys()
.map(|field_id| CellChangesetNotifyPB {
view_id: view_id.to_string(),
row_id: row_id.clone(),
field_id,

View File

@ -675,7 +675,7 @@ impl DatabaseViewEditor {
let filter_type = UpdatedFilterType::new(Some(old), new);
let filter_changeset = FilterChangeset::from_update(filter_type);
let filter_controller = self.filter_controller.clone();
let _ = tokio::spawn(async move {
tokio::spawn(async move {
if let Some(notification) = filter_controller
.did_receive_changes(filter_changeset)
.await

View File

@ -251,7 +251,7 @@ impl CellDataChangeset for DateTypeOption {
Ok(time) => Ok(Some(time)),
Err(_e) => {
let msg = format!("Parse {} failed", time_str);
Err(FlowyError::new(ErrorCode::InvalidDateTimeFormat, &msg))
Err(FlowyError::new(ErrorCode::InvalidDateTimeFormat, msg))
},
}
},

View File

@ -191,19 +191,15 @@ impl ToString for DateCellData {
}
}
#[derive(Clone, Debug, Copy, EnumIter, Serialize, Deserialize)]
#[derive(Clone, Debug, Copy, EnumIter, Serialize, Deserialize, Default)]
pub enum DateFormat {
Local = 0,
US = 1,
ISO = 2,
#[default]
Friendly = 3,
DayMonthYear = 4,
}
impl std::default::Default for DateFormat {
fn default() -> Self {
DateFormat::Friendly
}
}
impl std::convert::From<i64> for DateFormat {
fn from(value: i64) -> Self {
@ -237,9 +233,10 @@ impl DateFormat {
}
}
#[derive(Clone, Copy, PartialEq, Eq, EnumIter, Debug, Hash, Serialize, Deserialize)]
#[derive(Clone, Copy, PartialEq, Eq, EnumIter, Debug, Hash, Serialize, Deserialize, Default)]
pub enum TimeFormat {
TwelveHour = 0,
#[default]
TwentyFourHour = 1,
}
@ -270,12 +267,6 @@ impl TimeFormat {
}
}
impl std::default::Default for TimeFormat {
fn default() -> Self {
TimeFormat::TwentyFourHour
}
}
impl DecodedCellData for DateCellDataPB {
type Object = DateCellDataPB;

View File

@ -12,8 +12,9 @@ lazy_static! {
.collect::<Vec<String>>();
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, EnumIter, Serialize, Deserialize)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, EnumIter, Serialize, Deserialize, Default)]
pub enum NumberFormat {
#[default]
Num = 0,
USD = 1,
CanadianDollar = 2,
@ -58,12 +59,6 @@ impl NumberFormat {
}
}
impl std::default::Default for NumberFormat {
fn default() -> Self {
NumberFormat::Num
}
}
impl From<i64> for NumberFormat {
fn from(value: i64) -> Self {
match value {

View File

@ -31,7 +31,9 @@ impl SelectOption {
#[derive(PartialEq, Eq, Serialize, Deserialize, Debug, Clone)]
#[repr(u8)]
#[derive(Default)]
pub enum SelectOptionColor {
#[default]
Purple = 0,
Pink = 1,
LightPink = 2,
@ -43,12 +45,6 @@ pub enum SelectOptionColor {
Blue = 8,
}
impl std::default::Default for SelectOptionColor {
fn default() -> Self {
SelectOptionColor::Purple
}
}
#[derive(Debug)]
pub struct SelectOptionCellData {
pub options: Vec<SelectOption>,

View File

@ -72,16 +72,15 @@ mod tests {
let field_type = FieldType::MultiSelect;
let france = SelectOption::new("france");
let france_option_id = france.id.clone();
let argentina = SelectOption::new("argentina");
let argentina_option_id = argentina.id.clone();
let multi_select = MultiSelectTypeOption {
options: vec![france.clone(), argentina.clone()],
disable_color: false,
};
let france_option_id = france.id;
let argentina_option_id = argentina.id;
let field_rev = FieldBuilder::new(field_type.clone(), multi_select).build();
assert_eq!(

View File

@ -55,7 +55,6 @@ impl CSVImporter {
let rows = reader
.records()
.into_iter()
.flat_map(|r| r.ok())
.map(|record| {
record