Updates and Fixes

Cargo.toml

@@ -1,35 +1,39 @@
 [package]
 name = "ptv"
-version = "0.3.0"
-edition = "2021"
+edition = "2024"
+version = "0.3.1"
 license = "MIT"
 description = "A Rust library for the Public Transport Victoria (PTV) API"
 repository = "https://github.com/tascord/ptvrs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-anyhow = "1.0.81"
-chrono = { version = "0.4.35", features = ["serde"] }
-colored = "2.1.0"
-derive_more = "0.99.18"
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+colored = "3.0.0"
 dotenv = "0.15.0"
 hex = "0.4.3"
 hmac = "0.12.1"
-itertools = "0.13.0"
 once_cell = "1.19.0"
 reqwest = { version = "0.12.0", features = ["json"] }
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.114"
 sha1 = "0.10.6"
-to_and_fro = "0.5.0"
 tokio = { version = "1.36.0", features = ["full"] }
+
+[dependencies]
+anyhow = "1.0.81"
+chrono = { version = "0.4.35", features = ["serde"] }
+derive_more = { version = "2", features = ["display", "debug", "from"] }
+itertools = "0.14.0"
+rust_decimal = "1.37.1"
+serde = { version = "1.0.197", features = ["derive"] }
+serde_json = "1.0.114"
+to_and_fro = "0.7.1"
 url-escape = "0.1.1"
 
 [dev-dependencies]
 futures = "0.3.30"
 ptvrs-macros = { path = "ptvrs-macros" }
 
-
 [workspace]
 members = ["ptvrs-macros"]
+
+[features]

ptvrs-macros/src/lib.rs

@@ -1,23 +1,25 @@
-use std::fmt::format;
-
 use proc_macro::TokenStream;
-use proc_macro2::Span;
 use quote::{quote, ToTokens};
 
 use syn::{
-    bracketed, ext, parse::{self, discouraged::Speculative, Parse}, parse_macro_input, parse_quote, parse_quote_spanned, punctuated::{self, Punctuated}, spanned::Spanned, token, Expr, ExprStruct, FieldValue, Ident, LitStr, PatLit, Path, Stmt, Token
+    bracketed,
+    parse::{self, discouraged::Speculative, Parse},
+    parse_macro_input, parse_quote, parse_quote_spanned,
+    punctuated::Punctuated,
+    spanned::Spanned,
+    token, Expr, FieldValue, Ident, LitStr, Path, Stmt, Token,
 };
 
 struct Bracketed<T> {
-    bracket: token::Bracket,
+    _bracket: token::Bracket,
     inner: T,
 }
 
 impl<T: Parse> Parse for Bracketed<T> {
     fn parse(input: parse::ParseStream) -> syn::Result<Self> {
         let content;
         Ok(Self {
-            bracket: bracketed!(content in input),
+            _bracket: bracketed!(content in input),
             inner: content.parse()?,
         })
     }
@@ -32,7 +34,7 @@ impl<T: Parse> Parse for Grouped2<T> {
         if input.peek(token::Bracket) {
             let content;
             Ok(Self::Set(Bracketed {
-                bracket: bracketed!(content in input ),
+                _bracket: bracketed!(content in input ),
                 inner: Punctuated::parse_separated_nonempty(&content)?,
             }))
         } else {
@@ -176,7 +178,7 @@ pub fn make_test(_input: TokenStream) -> TokenStream {
         Grouped2::SingleSet(Params { extraparams, struc }) => {
             create_statement_vec(struc, &map, &name, &name.to_string(), extraparams)
         }
-        Grouped2::Set(Bracketed { bracket, inner }) => inner
+        Grouped2::Set(Bracketed { _bracket, inner }) => inner
             .into_iter()
             .flat_map(
                 |Bracketed {
@@ -212,7 +214,7 @@ fn create_statement_vec(
             .iter()
             .map(|group| {
                     let map = &map;
-                    let struc = struc;
+                    // let struc = struc;
                     let extraparams = extraparams.as_ref().map(|x| &x.expr);
                     let (test_name, parsed_struc, span) = match group {
                         Grouped::Single(Field { field_name, value }) => {
@@ -242,20 +244,20 @@ fn create_statement_vec(
                                     Some(value) => {
                                         test_name_vec.push(format!(
                                             "{}({})",
-                                            field_name.to_string(),
+                                            field_name,
                                             value.to_token_stream()
                                         ));
                                         parse_quote_spanned! { value.span() => #field_name: Some(#value) }
                                     }
                                     None => {
                                         test_name_vec.push(field_name.to_string());
-                                        parse_quote_spanned! { field_name.span() => #field_name: Some(true)} 
+                                        parse_quote_spanned! { field_name.span() => #field_name: Some(true)}
                                     }
                                 }})
                                 .collect::<Punctuated<syn::FieldValue, Token![,]>>();
                             let test_name = test_name_vec.join(",");
 
-                            let parsed_struc: Expr = parse_quote_spanned! { bracket.span => 
+                            let parsed_struc: Expr = parse_quote_spanned! { bracket.span =>
                                 #struc {
                                     #fields ,
                                     ..Default::default()
@@ -269,7 +271,7 @@ fn create_statement_vec(
                     } else {
                         parse_quote!(#parsed_struc )
                     };
-                    let test_name: LitStr =  parse_quote! { 
+                    let test_name: LitStr =  parse_quote! {
                         #test_name
                     };