update edition to 2024

Author: kurtbuilds

Cargo.toml

@@ -2,6 +2,10 @@
 resolver = "2"
 members = ["macro", "core", "ormlite", "cli"]
 
+[workspace.package]
+version = "0.24.2"
+edition = "2024"
+
 [workspace.dependencies]
 anyhow = "1"
 futures = "0.3.31"

attr/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ormlite-attr"
-version = "0.24.1"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "See `ormlite`."
 authors = ["Kurt Wolf <kurtwolfbuilds@gmail.com>"]
 license = "MIT"

attr/src/ext.rs

@@ -7,7 +7,7 @@ pub trait DeriveInputExt {
 impl DeriveInputExt for DeriveInput {
     fn fields(&self) -> syn::punctuated::Iter<'_, Field> {
         let fields = match &self.data {
-            Data::Struct(DataStruct { ref fields, .. }) => fields,
+            Data::Struct(DataStruct { fields, .. }) => fields,
             _ => panic!("#[ormlite] can only be used on structs"),
         };
         let fields = match fields {

cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ormlite-cli"
-version = "0.24.1"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "An ORM for people who love SQL. Use the `ormlite` crate, not this one."
 authors = ["Kurt Wolf <kurtwolfbuilds@gmail.com>"]
 license = "MIT"

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ormlite-core"
-version = "0.24.2"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "An ORM for people who love SQL. Use the `ormlite` crate, not this one."
 authors = ["Kurt Wolf <kurtwolfbuilds@gmail.com>"]
 license = "MIT"

core/src/query_builder/select.rs

@@ -1,11 +1,11 @@
 use crate::error::{Error, Result};
 use crate::model::Model;
 use crate::query_builder::args::QueryBuilderArgs;
-use crate::query_builder::{util, Placeholder};
+use crate::query_builder::{Placeholder, util};
 use sql::{Expr, OrderBy, ToSql};
 
-use crate::join::{criteria, select_columns, JoinDescription};
-use sql::{query::Where, Select};
+use crate::join::{JoinDescription, criteria, select_columns};
+use sql::{Select, query::Where};
 use sqlx::{Executor, IntoArguments};
 use std::marker::PhantomData;
 
@@ -44,7 +44,7 @@ where
     pub query: Select,
     arguments: QueryBuilderArgs<'args, DB>,
     model: PhantomData<Model>,
-    gen: Placeholder,
+    placeholder: Placeholder,
 }
 
 impl<'args, DB, M> SelectQueryBuilder<'args, DB, M>
@@ -234,7 +234,7 @@ where
     pub fn into_query_and_args(mut self) -> Result<(String, QueryBuilderArgs<'args, DB>)> {
         let q = self.query.to_sql(DB::dialect());
         let args = self.arguments;
-        let (q, placeholder_count) = util::replace_placeholders(&q, &mut self.gen)?;
+        let (q, placeholder_count) = util::replace_placeholders(&q, &mut self.placeholder)?;
         if placeholder_count != args.len() {
             return Err(Error::OrmliteError(format!(
                 "Failing to build query. {} placeholders were found in the query, but \
@@ -253,7 +253,7 @@ impl<'args, DB: sqlx::Database + DatabaseMetadata, M: Model<DB>> Default for Sel
             query: Select::default().from(M::table_name()),
             arguments: QueryBuilderArgs::default(),
             model: PhantomData,
-            gen: DB::placeholder(),
+            placeholder: DB::placeholder(),
         }
     }
 }

macro/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ormlite-macro"
-version = "0.24.1"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "An ORM for people who love SQL. Use the `ormlite` crate, not this one."
 authors = ["Kurt Wolf <kurtwolfbuilds@gmail.com>"]
 license = "MIT"

macro/src/lib.rs

@@ -15,13 +15,13 @@ use std::sync::OnceLock;
 use syn::DataEnum;
 
 use quote::quote;
-use syn::{parse_macro_input, Data, DeriveInput};
+use syn::{Data, DeriveInput, parse_macro_input};
 
 use codegen::into_arguments::impl_IntoArguments;
-use ormlite_attr::schema_from_filepaths;
 use ormlite_attr::DeriveInputExt;
 use ormlite_attr::ModelMeta;
 use ormlite_attr::TableMeta;
+use ormlite_attr::schema_from_filepaths;
 use ormlite_core::config::get_var_model_folders;
 
 use crate::codegen::common::OrmliteCodegen;
@@ -99,9 +99,11 @@ fn get_databases(table_meta: &TableMeta) -> Vec<Box<dyn OrmliteCodegen>> {
             count += 1;
         }
         if count > 1 {
-            panic!("You have more than one database configured using features, but no database is specified for this model. \
+            panic!(
+                "You have more than one database configured using features, but no database is specified for this model. \
             Specify a database for the model like this:\n\n#[ormlite(database = \"<db>\")]\n\nOr you can enable \
-            a default database feature:\n\n # Cargo.toml\normlite = {{ features = [\"default-<db>\"] }}");
+            a default database feature:\n\n # Cargo.toml\normlite = {{ features = [\"default-<db>\"] }}"
+            );
         }
     }
     if databases.is_empty() {
@@ -272,7 +274,7 @@ pub fn derive_ormlite_enum(input: TokenStream) -> TokenStream {
         .map(|v| v.to_string().to_case(Case::Snake))
         .collect();
 
-    let gen = quote! {
+    let placeholder = quote! {
         impl std::fmt::Display for #enum_name {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
                 match self {
@@ -330,5 +332,5 @@ pub fn derive_ormlite_enum(input: TokenStream) -> TokenStream {
         }
     };
 
-    gen.into()
+    placeholder.into()
 }

ormlite/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ormlite"
-version = "0.24.1"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Kurt Wolf <kurtwolfbuilds@gmail.com>"]
 description = "An ORM for people who love SQL"
 license = "MIT"