From f497bd6a3395a69ef5e4dfa8532afe1b5e08d054 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Fri, 31 Mar 2023 14:11:33 +1000 Subject: [PATCH] Bump Rust version --- build/ninja_gen/src/input.rs | 9 ++------- rslib/src/browser_table.rs | 8 ++------ rslib/src/config/mod.rs | 8 ++------ rslib/src/deckconfig/schema11.rs | 8 ++------ rslib/src/import_export/text/csv/import.rs | 1 - rslib/src/import_export/text/csv/metadata.rs | 1 - rslib/src/revlog/mod.rs | 8 ++------ rslib/src/search/parser.rs | 2 +- rslib/src/sync/collection/progress.rs | 9 ++------- rslib/src/template_filters.rs | 4 ++-- rust-toolchain.toml | 2 +- 11 files changed, 16 insertions(+), 44 deletions(-) diff --git a/build/ninja_gen/src/input.rs b/build/ninja_gen/src/input.rs index 773576611..00ae60483 100644 --- a/build/ninja_gen/src/input.rs +++ b/build/ninja_gen/src/input.rs @@ -6,12 +6,13 @@ use std::fmt::Display; use camino::Utf8PathBuf; -#[derive(Debug, Clone, Hash)] +#[derive(Debug, Clone, Hash, Default)] pub enum BuildInput { Single(String), Multiple(Vec), Glob(Glob), Inputs(Vec), + #[default] Empty, } @@ -21,12 +22,6 @@ impl AsRef for BuildInput { } } -impl Default for BuildInput { - fn default() -> Self { - BuildInput::Empty - } -} - impl From for BuildInput { fn from(v: String) -> Self { BuildInput::Single(v) diff --git a/rslib/src/browser_table.rs b/rslib/src/browser_table.rs index 28e009e8b..4e9803cc1 100644 --- a/rslib/src/browser_table.rs +++ b/rslib/src/browser_table.rs @@ -23,8 +23,10 @@ use crate::text::html_to_text_line; #[derive(Debug, PartialEq, Eq, Clone, Copy, Display, EnumIter, EnumString)] #[strum(serialize_all = "camelCase")] +#[derive(Default)] pub enum Column { #[strum(serialize = "")] + #[default] Custom, Answer, CardMod, @@ -53,12 +55,6 @@ pub enum Column { Tags, } -impl Default for Column { - fn default() -> Self { - Column::Custom - } -} - struct RowContext { notes_mode: bool, cards: Vec, diff --git a/rslib/src/config/mod.rs b/rslib/src/config/mod.rs index 7a5b6e6fa..396bf7ad3 100644 --- a/rslib/src/config/mod.rs +++ b/rslib/src/config/mod.rs @@ -287,18 +287,14 @@ impl Collection { } // 2021 scheduler moves this into deck config +#[derive(Default)] pub(crate) enum NewReviewMix { + #[default] Mix = 0, ReviewsFirst = 1, NewFirst = 2, } -impl Default for NewReviewMix { - fn default() -> Self { - NewReviewMix::Mix - } -} - #[derive(PartialEq, Eq, Serialize_repr, Deserialize_repr, Clone, Copy)] #[repr(u8)] pub(crate) enum Weekday { diff --git a/rslib/src/deckconfig/schema11.rs b/rslib/src/deckconfig/schema11.rs index 9a84e3c84..198970c61 100644 --- a/rslib/src/deckconfig/schema11.rs +++ b/rslib/src/deckconfig/schema11.rs @@ -163,8 +163,10 @@ pub struct RevConfSchema11 { #[derive(Serialize_repr, Deserialize_repr, Debug, PartialEq, Eq, Clone)] #[repr(u8)] +#[derive(Default)] pub enum LeechAction { Suspend = 0, + #[default] TagOnly = 1, } @@ -183,12 +185,6 @@ pub struct LapseConfSchema11 { other: HashMap, } -impl Default for LeechAction { - fn default() -> Self { - LeechAction::TagOnly - } -} - impl Default for RevConfSchema11 { fn default() -> Self { RevConfSchema11 { diff --git a/rslib/src/import_export/text/csv/import.rs b/rslib/src/import_export/text/csv/import.rs index eff82e7d8..9ddd84aa9 100644 --- a/rslib/src/import_export/text/csv/import.rs +++ b/rslib/src/import_export/text/csv/import.rs @@ -155,7 +155,6 @@ impl ColumnContext { ) -> Result> { reader .records() - .into_iter() .map(|res| { res.or_invalid("invalid csv") .map(|record| self.foreign_note_from_record(&record)) diff --git a/rslib/src/import_export/text/csv/metadata.rs b/rslib/src/import_export/text/csv/metadata.rs index 762bc03e0..ac2c8b219 100644 --- a/rslib/src/import_export/text/csv/metadata.rs +++ b/rslib/src/import_export/text/csv/metadata.rs @@ -302,7 +302,6 @@ fn collect_preview_records( let mut csv_reader = build_csv_reader(reader, metadata.delimiter())?; csv_reader .records() - .into_iter() .take(PREVIEW_LENGTH) .collect::>() .or_invalid("invalid csv") diff --git a/rslib/src/revlog/mod.rs b/rslib/src/revlog/mod.rs index a43f3f8ee..70b097c4e 100644 --- a/rslib/src/revlog/mod.rs +++ b/rslib/src/revlog/mod.rs @@ -60,7 +60,9 @@ pub struct RevlogEntry { #[derive(Serialize_repr, Deserialize_repr, Debug, PartialEq, Eq, TryFromPrimitive, Clone, Copy)] #[repr(u8)] +#[derive(Default)] pub enum RevlogReviewKind { + #[default] Learning = 0, Review = 1, Relearning = 2, @@ -71,12 +73,6 @@ pub enum RevlogReviewKind { Manual = 4, } -impl Default for RevlogReviewKind { - fn default() -> Self { - RevlogReviewKind::Learning - } -} - impl RevlogEntry { pub(crate) fn interval_secs(&self) -> u32 { u32::try_from(if self.interval > 0 { diff --git a/rslib/src/search/parser.rs b/rslib/src/search/parser.rs index b40a01b46..99185fb26 100644 --- a/rslib/src/search/parser.rs +++ b/rslib/src/search/parser.rs @@ -597,7 +597,7 @@ fn parse_mid(s: &str) -> ParseResult { /// ensure a list of ids contains only numbers and commas, returning unchanged /// if true used by nid: and cid: -fn check_id_list<'a, 'b>(s: &'a str, context: &'b str) -> ParseResult<'a, &'a str> { +fn check_id_list<'a>(s: &'a str, context: &str) -> ParseResult<'a, &'a str> { lazy_static! { static ref RE: Regex = Regex::new(r"^(\d+,)*\d+$").unwrap(); } diff --git a/rslib/src/sync/collection/progress.rs b/rslib/src/sync/collection/progress.rs index d79e4ad2c..e136868b4 100644 --- a/rslib/src/sync/collection/progress.rs +++ b/rslib/src/sync/collection/progress.rs @@ -7,19 +7,14 @@ use crate::sync::collection::protocol::SyncProtocol; use crate::sync::http_client::HttpSyncClient; use crate::sync::login::SyncAuth; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] pub enum SyncStage { + #[default] Connecting, Syncing, Finalizing, } -impl Default for SyncStage { - fn default() -> Self { - SyncStage::Connecting - } -} - #[derive(Debug, Default, Clone, Copy)] pub struct FullSyncProgress { pub transferred_bytes: usize, diff --git a/rslib/src/template_filters.rs b/rslib/src/template_filters.rs index 44e9e50d6..9f5cc2a5b 100644 --- a/rslib/src/template_filters.rs +++ b/rslib/src/template_filters.rs @@ -63,9 +63,9 @@ pub(crate) fn apply_filters<'a>( /// /// Returns true if filter was valid. /// Returns string if input text changed. -fn apply_filter<'a>( +fn apply_filter( filter_name: &str, - text: &'a str, + text: &str, field_name: &str, context: &RenderContext, ) -> (bool, Option) { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4c90bd79b..fdfb9d7fd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] # older versions may fail to compile; newer versions may fail the clippy tests -channel = "1.66.1" +channel = "1.68.2"