config derive: Improve and properly document InstanceConfigGlobal

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

diff --git a/server/server.rs b/server/server.rs
index 32d06a7e822cf70960219b1529b6dcc60ee5f96b..568fe6f259f9e5ed4ad05b551b4cd1281cc56f15 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -179,7 +179,7 @@ async fn async_main(opts: Opts, daemon: Option<Daemoniser>) {
       return Ok(None);
     }
 
-    let global_config = config::InstanceConfigGlobal::from(&ics);
+    let global_config = config::InstanceConfigGlobal::from(ics);
     let gc = (&server_name, &global_config);
 
     if pc.keys().all(|k| gc.inspect_key(k).is_some()) {

diff --git a/src/config_derive.rs b/src/config_derive.rs
index fd35ef1e9c127741c4408d8fd1ef547666a4f5a1..0f9322a927aa4598c27bdf0b1d16815688e92dc6 100644 (file)
--- a/src/config_derive.rs
+++ b/src/config_derive.rs
@@ -54,13 +54,9 @@ define_derive_deftly! {
   ///   }
   /// }
   ///
-  /// pub struct InstanceConfigCommon { ... }
-  /// impl InstanceConfigCommon {
-  ///   pub fn from(l: &[InstanceConfig]) { InstanceConfigCommon {
-  ///     field: <Type as ResolveGlobal>::resolve(l.iter().map(|e| &e.field)),
-  ///     ...
-  ///   } }
-  /// }
+  /// pub struct InstanceConfigGlobal { ... }
+  /// impl InspectableConfigAuto for InstanceConfigGlobal { ... }
+  /// impl From<&'_ [InstanceConfig]> for InstanceConfigGlobal { .. }
   /// ```
 
   InstanceConfig expect items:
@@ -122,8 +118,8 @@ define_derive_deftly! {
     )
   }
 
-  impl InstanceConfigGlobal {
-    pub fn from(l: &[InstanceConfig]) -> InstanceConfigGlobal {
+  impl From<&'_ [InstanceConfig]> for InstanceConfigGlobal {
+    fn from(l: &[InstanceConfig]) -> InstanceConfigGlobal {
       InstanceConfigGlobal {
         $(
           ${when fmeta(global)}