From a52da7f49531c8b64e8cb48772b635f22f364e8d Mon Sep 17 00:00:00 2001
From: Ralf Fuest <mail@rfuest.de>
Date: Fri, 6 Mar 2026 16:39:10 +0100
Subject: [PATCH 1/2] Bump eg-simulator dependency

---
 eg-bdf-examples/Cargo.toml       | 2 +-
 eg-bdf/Cargo.toml                | 2 +-
 eg-font-converter/Cargo.toml     | 2 +-
 tools/test-bdf-parser/Cargo.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eg-bdf-examples/Cargo.toml b/eg-bdf-examples/Cargo.toml
index fe69a85..30e8042 100644
--- a/eg-bdf-examples/Cargo.toml
+++ b/eg-bdf-examples/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 embedded-graphics = "0.8.1"
-embedded-graphics-simulator = "0.7.0"
+embedded-graphics-simulator = "0.8.0"
 # TODO: add non path dependency
 eg-bdf = { path = "../eg-bdf" }
 eg-font-converter = { path = "../eg-font-converter" }
diff --git a/eg-bdf/Cargo.toml b/eg-bdf/Cargo.toml
index 2f8a5ad..c8442f4 100644
--- a/eg-bdf/Cargo.toml
+++ b/eg-bdf/Cargo.toml
@@ -13,4 +13,4 @@ keywords = ["embedded-graphics", "font", "bdf"]
 embedded-graphics = "0.8.1"
 
 [dev-dependencies]
-embedded-graphics-simulator = "0.7.0"
+embedded-graphics-simulator = "0.8.0"
diff --git a/eg-font-converter/Cargo.toml b/eg-font-converter/Cargo.toml
index caa59ed..1532334 100644
--- a/eg-font-converter/Cargo.toml
+++ b/eg-font-converter/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.98"
 bdf-parser = { version = "0.1.0", path = "../bdf-parser" }
 eg-bdf = { path = "../eg-bdf" }
 embedded-graphics = "0.8.1"
-embedded-graphics-simulator = { version = "0.7.0", default-features = false }
+embedded-graphics-simulator = { version = "0.8.0", default-features = false }
 bitvec = "1.0.1"
 syn = { version = "2.0.104", default-features = false, features = ["full", "parsing"] }
 prettyplease = "0.2.35"
diff --git a/tools/test-bdf-parser/Cargo.toml b/tools/test-bdf-parser/Cargo.toml
index e6616f9..738535c 100644
--- a/tools/test-bdf-parser/Cargo.toml
+++ b/tools/test-bdf-parser/Cargo.toml
@@ -12,4 +12,4 @@ owo-colors = "4.2.2"
 clap = { version = "4.5.40", features = [ "derive" ] }
 anyhow = "1.0.98"
 embedded-graphics = "0.8.1"
-embedded-graphics-simulator = { version = "0.7.0", default-features = false }
+embedded-graphics-simulator = { version = "0.8.0", default-features = false }

From bea5edb445f1fc8f116831b98906cfc48cda39ea Mon Sep 17 00:00:00 2001
From: Ralf Fuest <mail@rfuest.de>
Date: Fri, 6 Mar 2026 16:44:51 +0100
Subject: [PATCH 2/2] Fix clippy warning

---
 bdf-parser/src/glyph.rs       |  2 +-
 eg-font-converter/src/lib.rs  | 13 ++++++++-----
 eg-font-converter/src/main.rs |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bdf-parser/src/glyph.rs b/bdf-parser/src/glyph.rs
index f38947f..7a98f4d 100644
--- a/bdf-parser/src/glyph.rs
+++ b/bdf-parser/src/glyph.rs
@@ -68,7 +68,7 @@ pub struct Glyph {
 }
 
 fn parse_bitmap_row(line: &Line<'_>, bitmap: &mut Vec<u8>) -> Result<(), ()> {
-    if !line.parameters.is_empty() || line.keyword.len() % 2 != 0 {
+    if !line.parameters.is_empty() || !line.keyword.len().is_multiple_of(2) {
         return Err(());
     }
 
diff --git a/eg-font-converter/src/lib.rs b/eg-font-converter/src/lib.rs
index 3021c54..cd2375d 100644
--- a/eg-font-converter/src/lib.rs
+++ b/eg-font-converter/src/lib.rs
@@ -278,12 +278,15 @@ impl<'a> FontConverter<'a> {
                 .iter()
                 .copied()
                 .map(|c| {
-                    let glyph_c =
-                        if bdf.glyphs.get(c).is_none() && self.missing_glyph_substitute.is_some() {
-                            self.missing_glyph_substitute.unwrap()
-                        } else {
+                    let glyph_c = if let Some(substitute) = self.missing_glyph_substitute {
+                        if bdf.glyphs.get(c).is_some() {
                             c
-                        };
+                        } else {
+                            substitute
+                        }
+                    } else {
+                        c
+                    };
 
                     bdf.glyphs
                         .get(glyph_c)
diff --git a/eg-font-converter/src/main.rs b/eg-font-converter/src/main.rs
index 8bf956a..68a1736 100644
--- a/eg-font-converter/src/main.rs
+++ b/eg-font-converter/src/main.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::{anyhow, Context, Result};
-use clap::{command, Parser};
+use clap::Parser;
 use eg_font_converter::FontConverter;
 use embedded_graphics::mono_font::mapping::Mapping;