Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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)
}
}
#[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>(())
})()