From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 26 Nov 2024 15:27:12 +0000 (+0100)
Subject: rec: follow clippy's advice, move static lib version to 5.2.0
X-Git-Tag: rec-5.2.0-rc1~27^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14895%2Fhead;p=thirdparty%2Fpdns.git

rec: follow clippy's advice, move static lib version to 5.2.0
---

diff --git a/pdns/recursordist/settings/generate.py b/pdns/recursordist/settings/generate.py
index 66a805572b..3500e8d0f2 100644
--- a/pdns/recursordist/settings/generate.py
+++ b/pdns/recursordist/settings/generate.py
@@ -410,7 +410,7 @@ def gen_rust_vec_default_functions(name, typeName, defvalue):
     ret = f'// DEFAULT HANDLING for {name}\n'
     ret += f'fn default_value_{name}() -> Vec<recsettings::{typeName}> {{\n'
     ret += f'    let msg = "default value defined for `{name}\' should be valid YAML";'
-    ret += f'    let deserialized: Vec<recsettings::{typeName}> = serde_yaml::from_str({quote(defvalue)}).expect(&msg);\n'
+    ret += f'    let deserialized: Vec<recsettings::{typeName}> = serde_yaml::from_str({quote(defvalue)}).expect(msg);\n'
     ret += f'    deserialized\n'
     ret += '}\n'
     ret += f'fn default_value_equal_{name}(value: &Vec<recsettings::{typeName}>)'
diff --git a/pdns/recursordist/settings/rust/Cargo.lock b/pdns/recursordist/settings/rust/Cargo.lock
index 0d4afaed32..807b4931c5 100644
--- a/pdns/recursordist/settings/rust/Cargo.lock
+++ b/pdns/recursordist/settings/rust/Cargo.lock
@@ -209,7 +209,7 @@ dependencies = [
 
 [[package]]
 name = "settings"
-version = "5.1.0"
+version = "5.2.0"
 dependencies = [
  "base64",
  "cxx",
diff --git a/pdns/recursordist/settings/rust/Cargo.toml b/pdns/recursordist/settings/rust/Cargo.toml
index 92d44032f6..fed8e823ad 100644
--- a/pdns/recursordist/settings/rust/Cargo.toml
+++ b/pdns/recursordist/settings/rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "settings"
 # Convention: major/minor is equal to rec's major/minor
-version = "5.1.0"
+version = "5.2.0"
 edition = "2021"
 
 [lib]
diff --git a/pdns/recursordist/settings/rust/src/bridge.rs b/pdns/recursordist/settings/rust/src/bridge.rs
index 8a2f761574..8b47796d68 100644
--- a/pdns/recursordist/settings/rust/src/bridge.rs
+++ b/pdns/recursordist/settings/rust/src/bridge.rs
@@ -153,7 +153,7 @@ fn validate_name(field: &str, val: &String) -> Result<(), ValidationError> {
             return Err(ValidationError { msg });
         }
         // XXX Too liberal, should check for alnum, - and proper \ddd
-        if !label.chars().all(|ch| ch.is_ascii()) {
+        if !label.is_ascii() {
             let msg = format!("{}: `{}' contains non-ascii character", field, val);
             return Err(ValidationError { msg });
         }