From 721fdedc16832839e6ac42367104cd9264506e55 Mon Sep 17 00:00:00 2001
From: Joakim Soderlund <joakim.soderlund@gmail.com>
Date: Sat, 22 Feb 2025 18:24:05 +0100
Subject: [PATCH] Upgrade to Rust 2024 Edition

---
 Cargo.toml             | 2 +-
 cli/Cargo.toml         | 2 +-
 query/Cargo.toml       | 2 +-
 query/src/optimizer.rs | 2 +-
 query/src/parser.rs    | 6 +++---
 src/archive/parser.rs  | 2 +-
 src/archive/story.rs   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 27752a1..9136d02 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fimfareader"
 version = "0.1.0"
 authors = ["Joakim Soderlund <joakim.soderlund@gmail.com>"]
-edition = "2021"
+edition = "2024"
 
 [workspace]
 members = [
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b9c75e3..494fb4e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fimfareader-cli"
 version = "0.1.0"
 authors = ["Joakim Soderlund <joakim.soderlund@gmail.com>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies.fimfareader]
 path = ".."
diff --git a/query/Cargo.toml b/query/Cargo.toml
index f1383e1..c6d8e4c 100644
--- a/query/Cargo.toml
+++ b/query/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fimfareader-query"
 version = "0.1.0"
 authors = ["Joakim Soderlund <joakim.soderlund@gmail.com>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies.derive_more]
 features = ["from"]
diff --git a/query/src/optimizer.rs b/query/src/optimizer.rs
index 3b007b2..b2f8887 100644
--- a/query/src/optimizer.rs
+++ b/query/src/optimizer.rs
@@ -2,8 +2,8 @@
 
 use chrono::prelude::*;
 use dateparser::parse_with_timezone;
-use regex::escape;
 use regex::RegexBuilder;
+use regex::escape;
 
 use fimfareader::error::Error;
 use fimfareader::error::Result;
diff --git a/query/src/parser.rs b/query/src/parser.rs
index 05b60b9..55899ef 100644
--- a/query/src/parser.rs
+++ b/query/src/parser.rs
@@ -4,6 +4,9 @@ use chrono::DateTime;
 use chrono::Utc;
 use derive_more::From;
 
+use nom::Err as NomErr;
+use nom::Finish;
+use nom::IResult;
 use nom::branch::alt;
 use nom::bytes::complete::escaped;
 use nom::bytes::complete::tag;
@@ -21,9 +24,6 @@ use nom::sequence::delimited;
 use nom::sequence::preceded;
 use nom::sequence::terminated;
 use nom::sequence::tuple;
-use nom::Err as NomErr;
-use nom::Finish;
-use nom::IResult;
 
 use fimfareader::archive::Story;
 use fimfareader::error::*;
diff --git a/src/archive/parser.rs b/src/archive/parser.rs
index 12cef08..7798a89 100644
--- a/src/archive/parser.rs
+++ b/src/archive/parser.rs
@@ -1,8 +1,8 @@
 //! Index parser.
 
 use std::io::BufRead;
-use std::sync::mpsc::channel;
 use std::sync::mpsc::Receiver;
+use std::sync::mpsc::channel;
 use std::thread::spawn;
 
 use rayon::prelude::*;
diff --git a/src/archive/story.rs b/src/archive/story.rs
index 1d76c63..f24deff 100644
--- a/src/archive/story.rs
+++ b/src/archive/story.rs
@@ -4,9 +4,9 @@ use std::sync::Arc;
 use std::sync::LazyLock;
 
 use chrono::prelude::*;
-use serde::de::Error;
 use serde::Deserialize;
 use serde::Deserializer;
+use serde::de::Error;
 use serde_json::Value;
 
 use super::interner::Interner;