From c029d3ec1dfda78a6bb450693ee6c1a363508685 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Fri, 21 Mar 2025 23:02:17 +0200
Subject: [PATCH] chore: update inputs, Rust 1.85 and 2024 edition

* fmt
---
 Cargo.toml          |  2 +-
 flake.lock          | 24 ++++++++++++------------
 rust-toolchain.toml |  2 +-
 src/config.rs       | 24 ++++++++++++++----------
 src/main.rs         |  2 +-
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9a1680e..c3d4bcb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "canwa"
 version = "0.1.0"
 authors = ["Jonni Liljamo <jonni@liljamo.com"]
-edition = "2021"
+edition = "2024"
 homepage = "https://liljamo.dev/canwa"
 license = "GPL-3.0-or-later"
 publish = false
diff --git a/flake.lock b/flake.lock
index bd6ebd4..27771dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737717945,
-        "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
+        "lastModified": 1742546557,
+        "narHash": "sha256-QyhimDBaDBtMfRc7kyL28vo+HTwXRPq3hz+BgSJDotw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ecd26a469ac56357fd333946a99086e992452b6a",
+        "rev": "bfa9810ff7104a17555ab68ebdeafb6705f129b1",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737465171,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "lastModified": 1742300892,
+        "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "rev": "ea26a82dda75bee6783baca6894040c8e6599728",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737771740,
-        "narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=",
+        "lastModified": 1742524367,
+        "narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2",
+        "rev": "70bf752d176b2ce07417e346d85486acea9040ef",
         "type": "github"
       },
       "original": {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index efd9dc3..c5794a6 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.85"
diff --git a/src/config.rs b/src/config.rs
index 069db16..f394e49 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -80,25 +80,29 @@ mod tests {
 
     #[tokio::test]
     async fn basic_ok() {
-        assert!(Config::from_str(
-            r#"
+        assert!(
+            Config::from_str(
+                r#"
             interface = "0.0.0.0"
             port = 8080
         "#
-        )
-        .await
-        .is_ok());
+            )
+            .await
+            .is_ok()
+        );
     }
 
     #[tokio::test]
     async fn invalid_interface() {
-        assert!(Config::from_str(
-            r#"
+        assert!(
+            Config::from_str(
+                r#"
             interface = "0.0.0.a"
             port = 8080
         "#
-        )
-        .await
-        .is_err());
+            )
+            .await
+            .is_err()
+        );
     }
 }
diff --git a/src/main.rs b/src/main.rs
index caacc71..bbcb969 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,9 +8,9 @@
 use std::sync::Arc;
 
 use axum::{
+    Json, Router,
     response::IntoResponse,
     routing::{get, post},
-    Json, Router,
 };
 use clap::Parser;
 use reqwest::StatusCode;
-- 
2.44.1