links passes tests, nice

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

diff --git a/src/global.rs b/src/global.rs
index 3ecd728dc0aaa8106f0161bccae7aa35431083e9..27b3be863c9170ad983f84696c67074a9166c4bd 100644 (file)
--- a/src/global.rs
+++ b/src/global.rs
@@ -472,14 +472,14 @@ impl DerefMut for LinksTable {
 
 impl From<&LinksTable> for Html {
   fn from(links: &LinksTable) -> Html {
-    Html("links: ".to_string() + &(
-      links.iter()
-        .filter_map(|(k,v)| {
-          let v = v.as_ref()?;
-          Some(Html::from((k, v.as_str())).0)
-        })
-        .join(" ")
-    ))
+    let mut s = links.iter()
+      .filter_map(|(k,v)| {
+        let v = v.as_ref()?;
+        Some(Html::from((k, v.as_str())).0)
+      })
+      .join(" ");
+    if s.len() != 0 { s = format!("links: {}", s) }
+    Html(s)
   }
 }
 

diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs
index 3de4bfd66985a6ca4b7950898ecef363171952e4..e19c0bd2487652c6d795558ec65aa94ee21f30f2 100644 (file)
--- a/wdriver/wdt-altergame.rs
+++ b/wdriver/wdt-altergame.rs
@@ -62,7 +62,7 @@ impl Ctx {
   #[throws(AE)]
   fn test_remove_link(&mut self, kind: LinkKind, desc: &'static str) {
     (||{
-      self.otter_table(&["remove-link"], &[&kind.to_string()])?;
+      self.otter_table(&["set-link"], &[&kind.to_string(), ""])?;
       self.check_link(desc, None)?;
       Ok::<_,AE>(())
     })()