Config inspection: tidying

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/client/client.rs b/client/client.rs
index 06643f07f248084384d03ca6f3bc4b98aa990b6e..cc8db31757c9e632cb8b6e6af2aa222a06d08a4a 100644 (file)
--- a/client/client.rs
+++ b/client/client.rs
@@ -336,10 +336,12 @@ async fn run_client<C:Hcc>(
 #[tokio::main]
 async fn main() {
   let opts = <Opts as clap::Parser>::parse();
-  let (ics,) = config::startup("hippotat", LinkEnd::Client,
-                               &opts.config, &opts.log, |_, ics| {
-    PrintConfigOpt(&&opts.print_config)
-      .implement(&mut ics.iter(), )?;
+  let (ics,) = config::startup(
+    "hippotat", LinkEnd::Client,
+    &opts.config, &opts.log, |_, ics| 
+  {
+    PrintConfigOpt(&opts.print_config)
+      .implement(&ics, )?;
 
     Ok((ics,))
   });

diff --git a/server/server.rs b/server/server.rs
index 44dbad6ff4130bd1dd05840a97620e1069b82f1e..8498d259b6b07eb97e5fd422a788b6a651e6bec6 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -179,9 +179,9 @@ async fn async_main(opts: Opts, daemon: Option<Daemoniser>) {
       let gc = (&server_name, &global_config);
 
       if pc.keys().all(|k| gc.inspect_key(k).is_some()) {
-        pc.implement(&mut iter::once(&gc))?;
+        pc.implement([&gc])?;
       } else {
-        pc.implement(&mut ics.iter())?;
+        pc.implement(&ics)?;
       }
     }
 

diff --git a/src/config.rs b/src/config.rs
index 026359cc9eca35831e53eab21ea2abe8ae76bfd9..447e67f94c1a191a3ccaffc709403d35a7430d48 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -128,7 +128,7 @@ impl PrintConfigOpt<'_> {
   #[throws(AE)]
   pub fn implement<'c, C: InspectableConfig + 'c>(
     self,
-    configs: impl Iterator<Item=&'c C>,
+    configs: impl IntoIterator<Item=&'c C>,
   ) {
     if let Some(arg) = self.0 {
       for config in configs {