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 708cfece076bff357a38a6e9e491db3277b9e1fd..585dc920c94e40068f8c6b1d67bae1a7679bb976 100644 (file)
--- 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 e1141467165d832bdfe967e509e6d7c74ac57b1c..a8c6985a0534b15f2a68a027c8d109e2b554c63d 100644 (file)
--- 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(),
       })