rec: make clippy happy

diff --git a/pdns/recursordist/settings/generate.py b/pdns/recursordist/settings/generate.py
index 454bbaf08b6d18247ccaf2cd087d2ddb97caf6db..9b7e8903ef39d8a1a5d9bd91fc7a70a559268573 100644 (file)
--- a/pdns/recursordist/settings/generate.py
+++ b/pdns/recursordist/settings/generate.py
@@ -560,7 +560,7 @@ def write_rust_merge_trait_impl(file, section, entries):
         name = entry['name']
         file.write(f'            if m.contains_key("{name}") {{\n')
         if rtype in ('bool', 'u64', 'f64', 'String'):
-            file.write(f'                self.{name} = rhs.{name}.to_owned();\n')
+            file.write(f'                rhs.{name}.clone_into(&mut self.{name});\n')
         else:
             file.write(f'                if is_overriding(m, "{name}") || ')
             file.write(f'self.{name} == DEFAULT_CONFIG.{section}.{name} {{\n')

diff --git a/pdns/recursordist/settings/rust/src/bridge.rs b/pdns/recursordist/settings/rust/src/bridge.rs
index 24998e2d1d37c20ea2d778a9504c2f924c647847..4ac678e05cd9c3cc96850e17b4dc7d91a9194ae0 100644 (file)
--- a/pdns/recursordist/settings/rust/src/bridge.rs
+++ b/pdns/recursordist/settings/rust/src/bridge.rs
@@ -88,19 +88,17 @@ fn is_port_number(str: &str) -> bool {
 
 pub fn validate_socket_address_or_name(field: &str, val: &String) -> Result<(), ValidationError> {
     let sa = validate_socket_address(field, val);
-    if sa.is_err() {
-        if !isValidHostname(val) {
-            let parts: Vec<&str> = val.split(':').collect();
-            if parts.len() != 2
-                || !isValidHostname(parts[0])
-                || !is_port_number(parts[1])
-            {
-                let msg = format!(
-                    "{}: value `{}' is not an IP, IP:port, name or name:port combination",
-                    field, val
-                );
-                return Err(ValidationError { msg });
-            }
+    if sa.is_err() && !isValidHostname(val) {
+        let parts: Vec<&str> = val.split(':').collect();
+        if parts.len() != 2
+            || !isValidHostname(parts[0])
+            || !is_port_number(parts[1])
+        {
+            let msg = format!(
+                "{}: value `{}' is not an IP, IP:port, name or name:port combination",
+                field, val
+            );
+            return Err(ValidationError { msg });
         }
     }
     Ok(())
@@ -163,7 +161,7 @@ pub fn validate_subnet(field: &str, val: &String) -> Result<(), ValidationError>
 }
 
 fn validate_address_family(addrfield: &str, localfield: &str, vec: &[String], local_address: &String) -> Result<(), ValidationError> {
-    if vec.len() == 0 {
+    if vec.is_empty() {
         let msg = format!("{}: cannot be empty", addrfield);
         return Err(ValidationError { msg });
     }