From ef80e60c027043f0b7f98fea19203e2fee7be304 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 Jan 2021 01:11:18 +0000 Subject: [PATCH] links passes tests, nice Signed-off-by: Ian Jackson --- src/global.rs | 16 ++++++++-------- wdriver/wdt-altergame.rs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/global.rs b/src/global.rs index 3ecd728d..27b3be86 100644 --- 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 3de4bfd6..e19c0bd2 100644 --- 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>(()) })() -- 2.30.2