Reformat and add clippy comment

omoerbeek · Feb 3, 2025 · 71acf60 · 71acf60
1 parent 38d5e3e
commit 71acf60
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc
@@ -1492,7 +1492,7 @@ bool matches(const std::unique_ptr<NetmaskGroup>& nmg, const std::unique_ptr<Com
   return nmg->get().match(address->get());
 }
 
-  void log(const std::shared_ptr<Logger>& logger, pdns::rust::misc::Priority log_level, ::rust::Str msg, const ::rust::Vec<KeyValue>& values)
+void log(const std::shared_ptr<Logger>& logger, pdns::rust::misc::Priority log_level, ::rust::Str msg, const ::rust::Vec<KeyValue>& values)
 {
   auto log = logger;
   for (const auto& [key, value] : values) {
@@ -1501,7 +1501,7 @@ bool matches(const std::unique_ptr<NetmaskGroup>& nmg, const std::unique_ptr<Com
   log->info(static_cast<Logr::Priority>(log_level), std::string(msg));
 }
 
-  void error(const std::shared_ptr<Logger>& logger, pdns::rust::misc::Priority log_level, ::rust::Str error, ::rust::Str msg, const ::rust::Vec<KeyValue>& values)
+void error(const std::shared_ptr<Logger>& logger, pdns::rust::misc::Priority log_level, ::rust::Str error, ::rust::Str msg, const ::rust::Vec<KeyValue>& values)
 {
   auto log = logger;
   for (const auto& [key, value] : values) {

diff --git a/pdns/recursordist/settings/rust/src/bridge.hh b/pdns/recursordist/settings/rust/src/bridge.hh
@@ -33,7 +33,8 @@ namespace Logr
 class Logger;
 }
 
-namespace pdns::rust::misc {
+namespace pdns::rust::misc
+{
 enum class Priority : uint8_t;
 enum class LogLevel : uint8_t;
 using Logger = ::Logr::Logger;
@@ -70,7 +71,6 @@ void log(const std::shared_ptr<Logger>& logger, Priority log_level, ::rust::Str
 void error(const std::shared_ptr<Logger>& logger, Priority log_level, ::rust::Str err, ::rust::Str msg, const ::rust::Vec<KeyValue>& values);
 }
 
-
 namespace pdns::rust::web::rec
 {
 using CredentialsHolder = ::CredentialsHolder;

diff --git a/pdns/recursordist/settings/rust/src/bridge.rs b/pdns/recursordist/settings/rust/src/bridge.rs
@@ -29,9 +29,9 @@ use std::str::FromStr;
 use std::sync::Mutex;
 
 use crate::helpers::OVERRIDE_TAG;
+use crate::misc::rustmisc;
 use crate::recsettings::{self, *};
 use crate::{Merge, ValidationError};
-use crate::misc::rustmisc;
 
 impl Default for ForwardZone {
     fn default() -> Self {

diff --git a/pdns/recursordist/settings/rust/src/misc.rs b/pdns/recursordist/settings/rust/src/misc.rs
@@ -42,6 +42,5 @@ pub mod rustmisc {
             msg: &str,
             values: &Vec<KeyValue>,
         );
-   }
+    }
 }
-
diff --git a/pdns/recursordist/settings/rust/src/web.rs b/pdns/recursordist/settings/rust/src/web.rs
@@ -1058,6 +1058,8 @@ mod rustweb {
         value: String,
     }
 
+    // Clippy does not seem to understand what cxx does and complains about needless_lifetimes
+    // I was unable to silence that warning
     struct Request<'a> {
         body: Vec<u8>,
         uri: String,
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,5 @@ pub mod rustmisc { @@
                 msg: &str,
                 values: &Vec<KeyValue>,
             );
-       }
+        }
     }