From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 31 Mar 2022 01:46:07 +0000 (+0100)
Subject: clippy: Miscellaneous minor changes, and allow lints
X-Git-Tag: otter-1.0.0~41
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=964dcb3022ea623f935d05537644e2bdb39e1397;p=otter.git

clippy: Miscellaneous minor changes, and allow lints

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

diff --git a/clippy-options b/clippy-options
index 708cfece..585dc920 100644
--- a/clippy-options
+++ b/clippy-options
@@ -30,3 +30,4 @@
 -A clippy::if_same_then_else # rust-clippy/issues/6285 etc.
 -A clippy::redundant_pattern_matching
 -A clippy::unnecessary_lazy_evaluations
+-A clippy::map_flatten
diff --git a/src/pcrender.rs b/src/pcrender.rs
index e1141467..a8c6985a 100644
--- a/src/pcrender.rs
+++ b/src/pcrender.rs
@@ -234,7 +234,7 @@ impl PieceRenderInstructions {
       out.push(UoDescription {
         wrc: WRC::UpdateSvg,
         kind: UoKind::Global,
-        def_key: DEFKEY_FLIP.into(),
+        def_key: DEFKEY_FLIP,
         opname: "flip".to_string(),
         desc: Html::lit("flip").into(),
       })