wip parsing

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

diff --git a/src/config.rs b/src/config.rs
index 98d67ed07bd6a821b2a665bca6c1a723d013babf..31a0fb91b0ac15cd996a1d5b78497a9fce831ab9 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -255,7 +255,7 @@ pub fn read() {
       agg.read_extra(extra).context("extra config")?;
     }
 
-    eprintln!("GOT {:?}", agg);
+    eprintln!("GOT {:#?}", agg);
 
     Ok::<_,AE>(())
   })().context("read configuration")?;

diff --git a/src/types.rs b/src/types.rs
index ecfb68ac65e6783f49c6ba7e7e5cacdb11058fd6..2b0ff243fa02f8905dfac4f5f41275229393e41b 100644 (file)
--- a/src/types.rs
+++ b/src/types.rs
@@ -34,7 +34,7 @@ impl FromStr for ServerName {
           )"x, s) {
       throw!(anyhow!("bad syntax for server name"));
     }
-    if regex_is_match!(r"[a-z-]", s) {
+    if ! regex_is_match!(r"[a-z-]", s) {
       throw!(anyhow!("bad syntax for server name \
                       (too much like an IPv4 address)"));
     }