chiark / gitweb /
config: fix client/server-specific parsing
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 24 Jul 2021 18:02:25 +0000 (19:02 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 24 Jul 2021 18:02:25 +0000 (19:02 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/config.rs

index 83b1b1c426b3c7d0906677300278c6234d0734bf..18e49698cd5538c2039577fe37d5003987fb6988 100644 (file)
@@ -565,18 +565,18 @@ impl<'c> ResolveContext<'c> {
 
   #[throws(AE)]
   pub fn client<T>(&self, key: &'static str) -> T
-  where T: Parseable {
+  where T: Parseable + Default {
     match self.end {
       LinkEnd::Client => self.ordinary(key)?,
-      LinkEnd::Server => Parseable::default_for_key(key)?,
+      LinkEnd::Server => default(),
     }
   }
   #[throws(AE)]
   pub fn server<T>(&self, key: &'static str) -> T
-  where T: Parseable {
+  where T: Parseable + Default {
     match self.end {
       LinkEnd::Server => self.ordinary(key)?,
-      LinkEnd::Client => Parseable::default_for_key(key)?,
+      LinkEnd::Client => default(),
     }
   }