Update lints for Rust 1.54

time-rs · Jul 30, 2021 · e5bb155 · e5bb155
1 parent e77e5a1
commit e5bb155
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 36 deletions.
diff --git a/benchmarks/offset_date_time.rs b/benchmarks/offset_date_time.rs
@@ -337,7 +337,7 @@ setup_benchmark! {
     fn std_eq(ben: &mut Bencher<'_>) {
         let a = OffsetDateTime::now_utc();
         let b = SystemTime::from(a);
-        ben.iter(|| b == a)
+        ben.iter(|| b == a);
     }
 
     fn ord_std(ben: &mut Bencher<'_>) {

diff --git a/benchmarks/time.rs b/benchmarks/time.rs
@@ -20,7 +20,7 @@ setup_benchmark! {
     }
 
     fn from_hms_nano(ben: &mut Bencher<'_>) {
-        ben.iter(|| Time::from_hms_nano(1, 2, 3, 4))
+        ben.iter(|| Time::from_hms_nano(1, 2, 3, 4));
     }
     // endregion constructors
 

diff --git a/src/error/parse.rs b/src/error/parse.rs
@@ -7,7 +7,6 @@ use crate::error::{ParseFromDescription, TryFromParsed};
 /// An error that occurred at some stage of parsing.
 #[cfg_attr(__time_03_docs, doc(cfg(feature = "parsing")))]
 #[allow(variant_size_differences)]
-#[allow(clippy::pub_enum_variant_names)] // an attribute on the variant doesn't work for some reason
 #[non_exhaustive]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Parse {

diff --git a/src/format_description/modifier.rs b/src/format_description/modifier.rs
@@ -407,59 +407,59 @@ impl Modifiers {
                 (b"month", b"repr:long") => modifiers.month_repr = Some(MonthRepr::Long),
                 (b"month", b"repr:short") => modifiers.month_repr = Some(MonthRepr::Short),
                 (b"offset_hour", b"sign:automatic") | (b"year", b"sign:automatic") => {
-                    modifiers.sign_is_mandatory = Some(false)
+                    modifiers.sign_is_mandatory = Some(false);
                 }
                 (b"offset_hour", b"sign:mandatory") | (b"year", b"sign:mandatory") => {
-                    modifiers.sign_is_mandatory = Some(true)
+                    modifiers.sign_is_mandatory = Some(true);
                 }
                 (b"period", b"case:upper") => modifiers.period_is_uppercase = Some(true),
                 (b"period", b"case:lower") => modifiers.period_is_uppercase = Some(false),
                 (b"subsecond", b"digits:1") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::One)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::One);
                 }
                 (b"subsecond", b"digits:2") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Two)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Two);
                 }
                 (b"subsecond", b"digits:3") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Three)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Three);
                 }
                 (b"subsecond", b"digits:4") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Four)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Four);
                 }
                 (b"subsecond", b"digits:5") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Five)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Five);
                 }
                 (b"subsecond", b"digits:6") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Six)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Six);
                 }
                 (b"subsecond", b"digits:7") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Seven)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Seven);
                 }
                 (b"subsecond", b"digits:8") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Eight)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Eight);
                 }
                 (b"subsecond", b"digits:9") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Nine)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Nine);
                 }
                 (b"subsecond", b"digits:1+") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::OneOrMore)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::OneOrMore);
                 }
                 (b"weekday", b"repr:short") => modifiers.weekday_repr = Some(WeekdayRepr::Short),
                 (b"weekday", b"repr:long") => modifiers.weekday_repr = Some(WeekdayRepr::Long),
                 (b"weekday", b"repr:sunday") => modifiers.weekday_repr = Some(WeekdayRepr::Sunday),
                 (b"weekday", b"repr:monday") => modifiers.weekday_repr = Some(WeekdayRepr::Monday),
                 (b"weekday", b"one_indexed:true") => modifiers.weekday_is_one_indexed = Some(true),
                 (b"weekday", b"one_indexed:false") => {
-                    modifiers.weekday_is_one_indexed = Some(false)
+                    modifiers.weekday_is_one_indexed = Some(false);
                 }
                 (b"week_number", b"repr:iso") => {
-                    modifiers.week_number_repr = Some(WeekNumberRepr::Iso)
+                    modifiers.week_number_repr = Some(WeekNumberRepr::Iso);
                 }
                 (b"week_number", b"repr:sunday") => {
-                    modifiers.week_number_repr = Some(WeekNumberRepr::Sunday)
+                    modifiers.week_number_repr = Some(WeekNumberRepr::Sunday);
                 }
                 (b"week_number", b"repr:monday") => {
-                    modifiers.week_number_repr = Some(WeekNumberRepr::Monday)
+                    modifiers.week_number_repr = Some(WeekNumberRepr::Monday);
                 }
                 (b"year", b"repr:full") => modifiers.year_repr = Some(YearRepr::Full),
                 (b"year", b"repr:last_two") => modifiers.year_repr = Some(YearRepr::LastTwo),

diff --git a/src/parsing/parsed.rs b/src/parsing/parsed.rs
@@ -123,7 +123,7 @@ impl Parsed {
                 match modifiers.repr {
                     WeekNumberRepr::Iso => {
                         self.iso_week_number =
-                            Some(NonZeroU8::new(value).ok_or(InvalidComponent("week number"))?)
+                            Some(NonZeroU8::new(value).ok_or(InvalidComponent("week number"))?);
                     }
                     WeekNumberRepr::Sunday => self.sunday_week_number = Some(value),
                     WeekNumberRepr::Monday => self.monday_week_number = Some(value),

diff --git a/time-macros/src/format_description/modifier.rs b/time-macros/src/format_description/modifier.rs
@@ -338,59 +338,59 @@ impl Modifiers {
                 (b"month", b"repr:long") => modifiers.month_repr = Some(MonthRepr::Long),
                 (b"month", b"repr:short") => modifiers.month_repr = Some(MonthRepr::Short),
                 (b"offset_hour", b"sign:automatic") | (b"year", b"sign:automatic") => {
-                    modifiers.sign_is_mandatory = Some(false)
+                    modifiers.sign_is_mandatory = Some(false);
                 }
                 (b"offset_hour", b"sign:mandatory") | (b"year", b"sign:mandatory") => {
-                    modifiers.sign_is_mandatory = Some(true)
+                    modifiers.sign_is_mandatory = Some(true);
                 }
                 (b"period", b"case:upper") => modifiers.period_is_uppercase = Some(true),
                 (b"period", b"case:lower") => modifiers.period_is_uppercase = Some(false),
                 (b"subsecond", b"digits:1") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::One)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::One);
                 }
                 (b"subsecond", b"digits:2") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Two)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Two);
                 }
                 (b"subsecond", b"digits:3") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Three)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Three);
                 }
                 (b"subsecond", b"digits:4") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Four)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Four);
                 }
                 (b"subsecond", b"digits:5") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Five)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Five);
                 }
                 (b"subsecond", b"digits:6") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Six)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Six);
                 }
                 (b"subsecond", b"digits:7") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Seven)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Seven);
                 }
                 (b"subsecond", b"digits:8") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Eight)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Eight);
                 }
                 (b"subsecond", b"digits:9") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::Nine)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::Nine);
                 }
                 (b"subsecond", b"digits:1+") => {
-                    modifiers.subsecond_digits = Some(SubsecondDigits::OneOrMore)
+                    modifiers.subsecond_digits = Some(SubsecondDigits::OneOrMore);
                 }
                 (b"weekday", b"repr:short") => modifiers.weekday_repr = Some(WeekdayRepr::Short),
                 (b"weekday", b"repr:long") => modifiers.weekday_repr = Some(WeekdayRepr::Long),
                 (b"weekday", b"repr:sunday") => modifiers.weekday_repr = Some(WeekdayRepr::Sunday),
                 (b"weekday", b"repr:monday") => modifiers.weekday_repr = Some(WeekdayRepr::Monday),
                 (b"weekday", b"one_indexed:true") => modifiers.weekday_is_one_indexed = Some(true),
                 (b"weekday", b"one_indexed:false") => {
-                    modifiers.weekday_is_one_indexed = Some(false)
+                    modifiers.weekday_is_one_indexed = Some(false);
                 }
                 (b"week_number", b"repr:iso") => {
-                    modifiers.week_number_repr = Some(WeekNumberRepr::Iso)
+                    modifiers.week_number_repr = Some(WeekNumberRepr::Iso);
                 }
                 (b"week_number", b"repr:sunday") => {
-                    modifiers.week_number_repr = Some(WeekNumberRepr::Sunday)
+                    modifiers.week_number_repr = Some(WeekNumberRepr::Sunday);
                 }
                 (b"week_number", b"repr:monday") => {
-                    modifiers.week_number_repr = Some(WeekNumberRepr::Monday)
+                    modifiers.week_number_repr = Some(WeekNumberRepr::Monday);
                 }
                 (b"year", b"repr:full") => modifiers.year_repr = Some(YearRepr::Full),
                 (b"year", b"repr:last_two") => modifiers.year_repr = Some(YearRepr::LastTwo),