Update dependencies (2025-03)

Change-Id: I236f0de29ac2d64d760891dc4043c901576a2a71

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: 1.84.0
+          toolchain: 1.85.0
           components: rustfmt, clippy, llvm-tools-preview
       - name: Rust Cache
         uses: actions/[email protected]
@@ -25,7 +25,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-1.84.0-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ runner.os }}-cargo-1.85.0-${{ hashFiles('**/Cargo.toml') }}
       - name: Setup Node
         uses: actions/[email protected]
         with:

Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "osm-gimmisn"
 version = "25.2.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 [dependencies]
 accept-language = "3.1.0"
-anyhow = "1.0.95"
-clap = "4.5.27"
+anyhow = "1.0.96"
+clap = "4.5.31"
 csv = "1.3.1"
 derivative = "2.2.0"
 gettext = "0.4.0"
@@ -16,25 +16,25 @@ html-escape = "0.2.13"
 html_parser = "0.7.0"
 isahc = "1.7.2"
 lazy_static = "1.5.0"
-log = "0.4.25"
-once_cell = "1.20.2"
+log = "0.4.26"
+once_cell = "1.20.3"
 regex = "1.11.1"
 rouille = "3.6.2"
 rusqlite = { version = "0.33.0", features = ["bundled"] }
 rust_icu_ucol = { version = "5.0.0", optional = true }
 rust_icu_unumberformatter = { version = "5.0.0", optional = true }
 rust_icu_ustring = { version = "5.0.0", optional = true }
-serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.138"
+serde = { version = "1.0.218", features = ["derive"] }
+serde_json = "1.0.139"
 serde_yaml = "0.9.34"
 simplelog = "0.12.2"
 time = { version = "0.3.37", features = ["formatting", "macros", "local-offset", "serde-well-known"] }
-toml = "0.8.19"
+toml = "0.8.20"
 unidecode = "0.3.0"
 url = "2.5.4"
 
 [dev-dependencies]
-flate2 = "1.0.35"
+flate2 = "1.1.0"
 sxd-document = "0.3.2"
 sxd-xpath = "0.4.2"
 

package.json

@@ -1,19 +1,19 @@
 {
   "license": "MIT",
   "dependencies": {
-    "@eslint/js": "9.19.0",
-    "@types/node": "22.13.0",
-    "chart.js": "4.4.7",
+    "@eslint/js": "9.21.0",
+    "@types/node": "22.13.5",
+    "chart.js": "4.4.8",
     "chartjs-plugin-datalabels": "2.2.0",
     "chartjs-plugin-trendline": "2.1.6",
     "clean-css-cli": "5.6.3",
-    "eslint": "9.19.0",
-    "globals": "15.14.0",
+    "eslint": "9.21.0",
+    "globals": "16.0.0",
     "sorttable": "1.0.2",
     "ts-loader": "9.5.2",
     "typescript": "5.7.3",
-    "typescript-eslint": "8.22.0",
-    "webpack": "5.97.1",
+    "typescript-eslint": "8.25.0",
+    "webpack": "5.98.0",
     "webpack-cli": "6.0.1"
   },
   "sideEffects": false,

src/area_files.rs

@@ -135,7 +135,10 @@ impl RelationFiles {
                 [relation, osm_id, name, highway, service, surface, leisure, osm_type],
             );
             if ret.is_err() {
-                info!("write_osm_json_streets: ignoring duplicated street: relation is '{}', id is '{}'", self.name, element.id);
+                info!(
+                    "write_osm_json_streets: ignoring duplicated street: relation is '{}', id is '{}'",
+                    self.name, element.id
+                );
             }
         }
 
@@ -202,7 +205,10 @@ impl RelationFiles {
                 [relation, osm_id, street, housenumber, postcode, place, housename, conscriptionnumber, flats, floor, door, unit, name, osm_type],
             );
             if ret.is_err() {
-                info!("write_osm_json_housenumbers: ignoring duplicated housenumber: relation is '{}', id is '{}'", self.name, element.id);
+                info!(
+                    "write_osm_json_housenumbers: ignoring duplicated housenumber: relation is '{}', id is '{}'",
+                    self.name, element.id
+                );
             }
         }
 

src/areas.rs

@@ -1017,7 +1017,7 @@ impl<'a> Relation<'a> {
     fn get_street_valid(&self) -> HashMap<String, Vec<String>> {
         let mut valid_dict: HashMap<String, Vec<String>> = HashMap::new();
 
-        if let Some(ref filters) = self.config.get_filters() {
+        if let Some(filters) = self.config.get_filters() {
             for (street, street_filter) in filters {
                 if let Some(ref valid) = street_filter.valid {
                     valid_dict.insert(street.clone(), valid.to_vec());
@@ -1669,7 +1669,7 @@ pub fn normalizer_contains(
     // number not in the ranges: raise a lint in case the problem is actionable (has street name,
     // has an actual number).
     if !ret && !street_name.is_empty() && number != 0 {
-        if let Some(ref mut lints) = lints {
+        if let Some(lints) = lints {
             let relation_name = relation_name.to_string();
             let street_name = street_name.to_string();
             let source = RelationLintSource::Range;

src/context/system.rs

@@ -11,9 +11,9 @@
 //! Trait implementations using the real file system, network, time, etc.
 
 use super::*;
-use isahc::config::Configurable as _;
 use isahc::ReadResponseExt as _;
 use isahc::RequestExt as _;
+use isahc::config::Configurable as _;
 use lazy_static::lazy_static;
 
 lazy_static! {

src/main.rs

@@ -12,8 +12,8 @@
 
 use std::collections::HashMap;
 use std::io::Write;
-use std::sync::mpsc;
 use std::sync::Mutex;
+use std::sync::mpsc;
 
 type Handler = fn(&[String], &mut dyn Write, &osm_gimmisn::context::Context) -> i32;
 

src/util.rs

@@ -17,8 +17,8 @@ use crate::i18n::translate as tr;
 use crate::overpass_query;
 use crate::ranges;
 use crate::yattag;
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use lazy_static::lazy_static;
 use std::collections::HashMap;
 use std::collections::HashSet;

src/wsgi.rs

@@ -183,8 +183,9 @@ fn handle_street_housenumbers(
             let div = doc.tag("div", &[("id", "no-osm-housenumbers")]);
             div.text(&tr("No existing house numbers"));
         } else {
-            let mut csv: String =
-                String::from("@id\tstreet\thousenumber\tpostcode\tplace\thousename\tconscriptionnumber\tflats\tfloor\tdoor\tunit\tname\t@type\n");
+            let mut csv: String = String::from(
+                "@id\tstreet\thousenumber\tpostcode\tplace\thousename\tconscriptionnumber\tflats\tfloor\tdoor\tunit\tname\t@type\n",
+            );
             let conn = ctx.get_database_connection()?;
             let mut stmt = conn.prepare("select osm_id, street, housenumber, postcode, place, housename, conscriptionnumber, flats, floor, door, unit, name, osm_type from osm_housenumbers where relation = ?1")?;
             let mut rows = stmt.query([&relation_name])?;
@@ -203,8 +204,8 @@ fn handle_street_housenumbers(
                 let name: String = row.get(11).unwrap();
                 let osm_type: String = row.get(12).unwrap();
                 csv += &format!(
-                "{osm_id}\t{street}\t{housenumber}\t{postcode}\t{place}\t{housename}\t{conscriptionnumber}\t{flats}\t{floor}\t{door}\t{unit}\t{name}\t{osm_type}\n"
-            );
+                    "{osm_id}\t{street}\t{housenumber}\t{postcode}\t{place}\t{housename}\t{conscriptionnumber}\t{flats}\t{floor}\t{door}\t{unit}\t{name}\t{osm_type}\n"
+                );
             }
             let mut read = csv.as_bytes();
             doc.append_value(