attempt to revert to edition 2021 to fix CI

But the code remains 2024-ready

.github/workflows/checks.yml

@@ -122,8 +122,7 @@ jobs:
           --workspace
           --all-features
           --run-types Tests
-        # Doctests are disabled because edition 2024 seems to have broken this
-        # --run-types Doctests
+          --run-types Doctests
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v2
         with:

Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/remi-dupre/opening-hours-rs"
 documentation = "https://docs.rs/opening-hours"
 homepage = "https://github.com/remi-dupre/opening-hours-rs"
 description = "A parser and evaluation tool for the opening_hours fields in OpenStreetMap."
-edition = "2024"
+edition = "2021"
 exclude = ["dist/"]  # generated by maturin
 build = "opening-hours/build.rs"
 

compact-calendar/Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/remi-dupre/opening-hours-rs"
 documentation = "https://docs.rs/compact-calendar"
 homepage = "https://github.com/remi-dupre/opening-hours-rs/tree/master/compact-calendar"
 description = "Compact representation of a set of days based on a bit-maps"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4", default-features = false }

fuzz/Cargo.toml

@@ -2,7 +2,7 @@
 name = "fuzz"
 version = "0.1.0"
 authors = ["Rémi Dupré <remi@dupre.io>"]
-edition = "2024"
+edition = "2021"
 
 [features]
 default = []

fuzz/fuzz_targets/fuzz_oh.rs

@@ -1,6 +1,6 @@
 #![no_main]
-use fuzz::{Data, run_fuzz_oh};
-use libfuzzer_sys::{Corpus, fuzz_target};
+use fuzz::{run_fuzz_oh, Data};
+use libfuzzer_sys::{fuzz_target, Corpus};
 
 fuzz_target!(|data: Data| -> Corpus {
     if run_fuzz_oh(data) {

fuzz/src/tests.rs

@@ -5,7 +5,7 @@ use std::path::Path;
 use arbitrary::{Arbitrary, Unstructured};
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
 
-use crate::{CompareWith, Data, Operation, run_fuzz_oh};
+use crate::{run_fuzz_oh, CompareWith, Data, Operation};
 
 #[test]
 fn no_fuzz_before_1900() {

opening-hours-py/Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/remi-dupre/opening-hours-rs"
 documentation = "https://remi-dupre.github.io/opening-hours-rs/opening_hours.html"
 homepage = "https://github.com/remi-dupre/opening-hours-rs/tree/master/opening-hours-py"
 description = "A parser and toolkit for the opening_hours in OpenStreetMap written in Rust."
-edition = "2024"
+edition = "2021"
 
 [lib]
 name = "opening_hours"

opening-hours-py/src/types/datetime.rs

@@ -4,8 +4,8 @@ use chrono::{DateTime, Local, NaiveDateTime, TimeDelta};
 use pyo3::prelude::*;
 use pyo3_stub_gen::{PyStubType, TypeInfo};
 
-use opening_hours_rs::DATE_END;
 use opening_hours_rs::localization::{Localize, TzLocation};
+use opening_hours_rs::DATE_END;
 
 #[derive(Clone, Copy, FromPyObject, IntoPyObject)]
 pub(crate) enum DateTimeMaybeAware {

opening-hours-syntax/Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/remi-dupre/opening-hours-rs"
 documentation = "https://docs.rs/opening-hours-syntax"
 homepage = "https://github.com/remi-dupre/opening-hours-rs/tree/master/opening-hours-syntax"
 description = "A parser for opening_hours fields in OpenStreetMap."
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4", default-features = false }

opening-hours-syntax/src/parser.rs

@@ -7,8 +7,8 @@ use std::sync::Arc;
 
 use chrono::Duration;
 
-use pest::Parser;
 use pest::iterators::Pair;
+use pest::Parser;
 
 use crate::error::{Error, Result};
 use crate::extended_time::ExtendedTime;

opening-hours-syntax/src/rules/day.rs

@@ -518,6 +518,4 @@ macro_rules! impl_convert_for_month {
     };
 }
 
-impl_convert_for_month!(
-    u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, usize, isize
-);
+impl_convert_for_month!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, usize, isize);

opening-hours-syntax/src/rules/mod.rs

@@ -4,10 +4,10 @@ pub mod time;
 use std::fmt::Display;
 use std::sync::Arc;
 
-use crate::ExtendedTime;
-use crate::normalize::{Bounded, canonical_to_seq, ruleseq_to_selector};
+use crate::normalize::{canonical_to_seq, ruleseq_to_selector, Bounded};
 use crate::rubik::{DimFromBack, Paving, Paving5D};
 use crate::sorted_vec::UniqueSortedVec;
+use crate::ExtendedTime;
 
 // OpeningHoursExpression
 

opening-hours/benches/benchmarks.rs

@@ -2,7 +2,7 @@ use opening_hours::localization::{Coordinates, Country};
 use opening_hours::{Context, OpeningHours};
 
 use chrono::NaiveDateTime;
-use criterion::{Criterion, black_box, criterion_group, criterion_main};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 const SCH_24_7: &str = "24/7";
 const SCH_ADDITION: &str = "10:00-12:00 open, 14:00-16:00 unknown, 16:00-23:00 closed";

opening-hours/build.rs

@@ -5,9 +5,9 @@ use std::io::{BufRead, BufReader, BufWriter};
 use std::path::{Path, PathBuf};
 
 use chrono::NaiveDate;
-use flate2::Compression;
 use flate2::write::DeflateEncoder;
-use rustc_version::{Channel, version_meta};
+use flate2::Compression;
+use rustc_version::{version_meta, Channel};
 
 use compact_calendar::CompactCalendar;
 

opening-hours/src/filter/date_filter.rs

@@ -5,11 +5,11 @@ use chrono::{Duration, NaiveDate, Weekday};
 
 use opening_hours_syntax::rules::day::{self as ds, Month};
 
-use crate::Context;
 use crate::localization::Localize;
 use crate::opening_hours::DATE_END;
 use crate::utils::dates::{count_days_in_month, easter};
 use crate::utils::range::WrappingRange;
+use crate::Context;
 
 /// Get the first valid date before given "yyyy/mm/dd", for example if
 /// 2021/02/30 is given, this will return february 28th as 2021 is not a leap

opening-hours/src/filter/time_filter.rs

@@ -5,9 +5,9 @@ use chrono::NaiveDate;
 use opening_hours_syntax::extended_time::ExtendedTime;
 use opening_hours_syntax::rules::time as ts;
 
-use crate::Context;
 use crate::localization::Localize;
 use crate::utils::range::{range_intersection, ranges_union};
+use crate::Context;
 
 pub(crate) fn time_selector_intervals_at<'a, L: 'a + Localize>(
     ctx: &'a Context<L>,

opening-hours/src/lib.rs

@@ -19,6 +19,6 @@ mod tests;
 // Public re-exports
 // TODO: make opening_hours.rs lighter and less spaghetty
 pub use crate::context::{Context, ContextHolidays};
-pub use crate::opening_hours::{DATE_END, OpeningHours};
+pub use crate::opening_hours::{OpeningHours, DATE_END};
 pub use crate::utils::range::DateTimeRange;
 pub use opening_hours_syntax::rules::RuleKind;

opening-hours/src/opening_hours.rs

@@ -5,18 +5,18 @@ use std::sync::Arc;
 
 use chrono::{Duration, NaiveDate, NaiveDateTime, NaiveTime};
 
-use opening_hours_syntax::Error as ParserError;
 use opening_hours_syntax::extended_time::ExtendedTime;
 use opening_hours_syntax::rules::{OpeningHoursExpression, RuleKind, RuleOperator, RuleSequence};
+use opening_hours_syntax::Error as ParserError;
 
-use crate::Context;
-use crate::DateTimeRange;
 use crate::filter::date_filter::DateFilter;
 use crate::filter::time_filter::{
-    TimeFilter, time_selector_intervals_at, time_selector_intervals_at_next_day,
+    time_selector_intervals_at, time_selector_intervals_at_next_day, TimeFilter,
 };
 use crate::localization::{Localize, NoLocation};
 use crate::schedule::Schedule;
+use crate::Context;
+use crate::DateTimeRange;
 
 /// The lower bound of dates handled by specification
 pub const DATE_START: NaiveDateTime = {

opening-hours/src/tests/issues.rs

@@ -4,7 +4,7 @@
 use opening_hours_syntax::error::Error;
 use opening_hours_syntax::rules::RuleKind;
 
-use crate::{DateTimeRange, OpeningHours, datetime};
+use crate::{datetime, DateTimeRange, OpeningHours};
 
 /// https://github.com/remi-dupre/opening-hours-rs/issues/23
 #[test]

opening-hours/src/tests/localization.rs

@@ -1,5 +1,5 @@
 use crate::localization::{Coordinates, TzLocation};
-use crate::{Context, OpeningHours, datetime};
+use crate::{datetime, Context, OpeningHours};
 
 #[cfg(feature = "auto-timezone")]
 const COORDS_PARIS: Coordinates = Coordinates::new(48.8535, 2.34839).unwrap();

opening-hours/src/tests/month_selector.rs

@@ -1,7 +1,7 @@
 use opening_hours_syntax::error::Error;
 use opening_hours_syntax::rules::RuleKind::*;
 
-use crate::{OpeningHours, datetime, schedule_at};
+use crate::{datetime, schedule_at, OpeningHours};
 
 #[test]
 fn exact_date() -> Result<(), Error> {

opening-hours/src/tests/next_change.rs

@@ -1,26 +1,22 @@
-use crate::{Context, OpeningHours, datetime};
+use crate::{datetime, Context, OpeningHours};
 use opening_hours_syntax::error::Error;
 
 #[test]
 fn always_open() -> Result<(), Error> {
-    assert!(
-        "24/7"
-            .parse::<OpeningHours>()?
-            .next_change(datetime!("2019-02-10 11:00"))
-            .is_none()
-    );
+    assert!("24/7"
+        .parse::<OpeningHours>()?
+        .next_change(datetime!("2019-02-10 11:00"))
+        .is_none());
 
     Ok(())
 }
 
 #[test]
 fn date_limit_exceeded() -> Result<(), Error> {
-    assert!(
-        "24/7"
-            .parse::<OpeningHours>()?
-            .next_change(datetime!("+10000-01-01 00:00"))
-            .is_none()
-    );
+    assert!("24/7"
+        .parse::<OpeningHours>()?
+        .next_change(datetime!("+10000-01-01 00:00"))
+        .is_none());
     Ok(())
 }
 
@@ -94,11 +90,9 @@ fn outside_date_bounds() -> Result<(), Error> {
         datetime!("1900-01-01 00:00")
     );
 
-    assert!(
-        OpeningHours::parse("24/7")?
-            .next_change(after_bounds)
-            .is_none()
-    );
+    assert!(OpeningHours::parse("24/7")?
+        .next_change(after_bounds)
+        .is_none());
 
     Ok(())
 }

opening-hours/src/tests/parser.rs

@@ -16,11 +16,9 @@ fn parse_open_ended() {
 
 #[test]
 fn parse_invalid() {
-    assert!(
-        "this is not a valid expression"
-            .parse::<OpeningHours>()
-            .is_err()
-    );
+    assert!("this is not a valid expression"
+        .parse::<OpeningHours>()
+        .is_err());
     assert!("10:00-100:00".parse::<OpeningHours>().is_err());
     assert!("10:00-12:00 tomorrow".parse::<OpeningHours>().is_err());
 }
@@ -38,11 +36,9 @@ fn parse_relaxed() {
     assert!("04:00 - 08:00".parse::<OpeningHours>().is_ok());
     assert!("4:00 - 8:00".parse::<OpeningHours>().is_ok());
 
-    assert!(
-        "Mo-Fr 10:00-18:00;Sa-Su 10:00-12:00"
-            .parse::<OpeningHours>()
-            .is_ok()
-    );
+    assert!("Mo-Fr 10:00-18:00;Sa-Su 10:00-12:00"
+        .parse::<OpeningHours>()
+        .is_ok());
 }
 
 #[test]