From 30f6ae38f47cbe11a645650dc47582988c2b3bdf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 3 Jan 2021 22:58:15 +0000 Subject: [PATCH] wip links Signed-off-by: Ian Jackson --- src/global.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/global.rs b/src/global.rs index 10f13bd4..79e30999 100644 --- a/src/global.rs +++ b/src/global.rs @@ -455,6 +455,13 @@ impl Display for InstanceName { } } +impl From<(LinkKind, &str)> for Html { + fn from((k, v): (LinkKind, &str)) -> Html { + let url = htmlescape::encode_minimal(v); + Html(format!("{kind}", url=url, kind=k)) + } +} + impl Deref for LinksTable { type Target = EnumMap>; fn deref(&self) -> &Self::Target { &self.0 } @@ -468,9 +475,7 @@ impl From<&LinksTable> for Html { Html(links.iter() .filter_map(|(k,v)| { let v = v.as_ref()?; - let url = htmlescape::encode_minimal(v); - Some(format!("{kind}", - url=url, kind=k)) + Some(Html::from((k, v.as_str())).0) }) .join(" | ")) } -- 2.30.2