Upgrade to 2024 edition

evestera · evestera · commit b874cd8055d4 · 2025-02-27T19:17:55.000+01:00
diff --git a/json_typegen/Cargo.toml b/json_typegen/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://typegen.vestera.as"
 repository = "https://github.com/evestera/json_typegen"
 documentation = "https://docs.rs/json_typegen"
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 
 [features]
 default = ["remote-samples", "local-samples"]
diff --git a/json_typegen_cli/Cargo.toml b/json_typegen_cli/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://typegen.vestera.as"
 repository = "https://github.com/evestera/json_typegen"
 documentation = "https://docs.rs/json_typegen_cli"
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 clap = "2.33.3"
diff --git a/json_typegen_cli/src/main.rs b/json_typegen_cli/src/main.rs
@@ -1,6 +1,6 @@
 use clap::{App, Arg};
 use json_typegen_shared::internal_util::display_error_with_causes;
-use json_typegen_shared::{codegen, codegen_from_macro, parse, Options, OutputMode};
+use json_typegen_shared::{Options, OutputMode, codegen, codegen_from_macro, parse};
 use std::fs::OpenOptions;
 use std::io::{self, Read, Write};
 
diff --git a/json_typegen_demo/Cargo.toml b/json_typegen_demo/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.7.0"
 authors = ["Erik Vesteraas <erik@vestera.as>"]
 license = "MIT/Apache-2.0"
 publish = false
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 serde = "1.0"
diff --git a/json_typegen_shared/Cargo.toml b/json_typegen_shared/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://typegen.vestera.as"
 repository = "https://github.com/evestera/json_typegen"
 documentation = "https://docs.rs/json_typegen_shared"
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 exclude = ["/benches/"]
 
 [features]
diff --git a/json_typegen_shared/benches/bench.rs b/json_typegen_shared/benches/bench.rs
@@ -9,7 +9,7 @@
 extern crate json_typegen_shared;
 extern crate test;
 
-use json_typegen_shared::{codegen, Options};
+use json_typegen_shared::{Options, codegen};
 use test::Bencher;
 
 macro_rules! file_bench {
diff --git a/json_typegen_shared/src/generation/json_schema.rs b/json_typegen_shared/src/generation/json_schema.rs
@@ -1,6 +1,6 @@
 use linked_hash_map::LinkedHashMap;
 
-use crate::generation::value::{pretty_print_value, Value};
+use crate::generation::value::{Value, pretty_print_value};
 use crate::options::Options;
 use crate::shape::{self, Shape};
 use crate::to_singular::to_singular;
diff --git a/json_typegen_shared/src/generation/kotlin.rs b/json_typegen_shared/src/generation/kotlin.rs
@@ -1,11 +1,11 @@
 use linked_hash_map::LinkedHashMap;
 use std::collections::HashSet;
 
+use crate::OutputMode;
 use crate::options::{ImportStyle, Options, StringTransform};
 use crate::shape::{self, Shape};
 use crate::to_singular::to_singular;
 use crate::util::{kebab_case, lower_camel_case, snake_case, type_case};
-use crate::OutputMode;
 
 struct Ctxt {
     options: Options,
diff --git a/json_typegen_shared/src/generation/shape.rs b/json_typegen_shared/src/generation/shape.rs
@@ -1,6 +1,6 @@
 use linked_hash_map::LinkedHashMap;
 
-use crate::generation::value::{pretty_print_value, Value};
+use crate::generation::value::{Value, pretty_print_value};
 use crate::options::Options;
 use crate::shape::{self, Shape};
 use crate::util::string_hashmap;
diff --git a/json_typegen_shared/src/generation/typescript_type_alias.rs b/json_typegen_shared/src/generation/typescript_type_alias.rs
@@ -2,7 +2,7 @@ use linked_hash_map::LinkedHashMap;
 
 use crate::generation::typescript::{collapse_option, is_ts_identifier};
 use crate::options::Options;
-use crate::shape::{self, common_shape, Shape};
+use crate::shape::{self, Shape, common_shape};
 
 pub struct Ctxt {
     options: Options,
diff --git a/json_typegen_shared/src/generation/zod_schema.rs b/json_typegen_shared/src/generation/zod_schema.rs
@@ -2,7 +2,7 @@ use linked_hash_map::LinkedHashMap;
 
 use crate::generation::typescript::{collapse_option, is_ts_identifier};
 use crate::options::Options;
-use crate::shape::{self, common_shape, Shape};
+use crate::shape::{self, Shape, common_shape};
 use crate::util::lower_camel_case;
 
 pub struct Ctxt {
diff --git a/json_typegen_shared/src/inference/jsoninfer.rs b/json_typegen_shared/src/inference/jsoninfer.rs
@@ -1,8 +1,8 @@
+use crate::Options;
 use crate::hints::{HintType, Hints};
 use crate::inference::jsoninputerr::JsonInputErr;
 use crate::inference::jsonlex::{JsonLexer, JsonToken};
-use crate::shape::{common_shape, Shape};
-use crate::Options;
+use crate::shape::{Shape, common_shape};
 use linked_hash_map::LinkedHashMap;
 use std::io::Read;
 use std::iter::Peekable;
@@ -96,16 +96,19 @@ impl<T: Iterator<Item = Result<JsonToken, JsonInputErr>>> Inference<T> {
 
     fn infer_map(&mut self, options: &Options, hints: &Hints) -> Result<Shape, JsonInputErr> {
         let shape = self.infer_object(options, hints)?;
-        if let Shape::Struct { fields } = shape {
-            let inner = fields
-                .into_iter()
-                .map(|(_, value)| value)
-                .fold(Shape::Bottom, common_shape);
-            Ok(Shape::MapT {
-                val_type: Box::new(inner),
-            })
-        } else {
-            panic!("Got non-object from infer_object")
+        match shape {
+            Shape::Struct { fields } => {
+                let inner = fields
+                    .into_iter()
+                    .map(|(_, value)| value)
+                    .fold(Shape::Bottom, common_shape);
+                Ok(Shape::MapT {
+                    val_type: Box::new(inner),
+                })
+            }
+            _ => {
+                panic!("Got non-object from infer_object")
+            }
         }
     }
 
diff --git a/json_typegen_shared/src/parse.rs b/json_typegen_shared/src/parse.rs
@@ -4,7 +4,7 @@
 
 use syn;
 use syn::parse::{boolean, ident, string};
-use synom::{alt, call, named, punct, IResult};
+use synom::{IResult, alt, call, named, punct};
 
 use crate::hints::Hint;
 use crate::options::{ImportStyle, InputMode, Options, OutputMode, StringTransform};
diff --git a/json_typegen_shared/src/sql.rs b/json_typegen_shared/src/sql.rs
@@ -94,7 +94,7 @@ fn shape_for_column(column: &ColumnDef) -> Shape {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{codegen_from_shape, Options, OutputMode};
+    use crate::{Options, OutputMode, codegen_from_shape};
 
     #[test]
     fn test_sql_to_shape() {
diff --git a/json_typegen_shared/tests/python_generation.rs b/json_typegen_shared/tests/python_generation.rs
@@ -1,4 +1,4 @@
-use json_typegen_shared::{codegen, ImportStyle, Options, OutputMode};
+use json_typegen_shared::{ImportStyle, Options, OutputMode, codegen};
 
 /// Function to test AST equality, not string equality
 fn code_output_test(name: &str, input: &str, expected: &str) {
diff --git a/json_typegen_shared/tests/with_defaults.rs b/json_typegen_shared/tests/with_defaults.rs
@@ -1,6 +1,6 @@
-use testsyn::{parse_str, Item};
+use testsyn::{Item, parse_str};
 
-use json_typegen_shared::{codegen, ImportStyle, Options};
+use json_typegen_shared::{ImportStyle, Options, codegen};
 
 /// Function to test AST equality, not string equality
 fn code_output_test(name: &str, input: &str, expected: &str) {
diff --git a/json_typegen_wasm/Cargo.toml b/json_typegen_wasm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "json_typegen_wasm"
 version = "0.7.0"
 authors = ["Erik Vesteraas <erik@vestera.as>"]
-edition = "2021"
+edition = "2024"
 publish = false
 description = "WASM wrapper for json_typegen. Codegen from JSON samples."
 homepage = "https://typegen.vestera.as"
