chore: pre-generate bindgen output, fix clippy warnings

Author: franzos

litehtml/examples/browse.rs

@@ -14,9 +14,9 @@ use url::Url;
 use litehtml::pixbuf::PixbufContainer;
 use litehtml::selection::Selection;
 use litehtml::{
-    BackgroundLayer, BorderRadiuses, Borders, Color, ConicGradient, DocumentContainer,
-    DrawContext, FontDescription, FontHandle, FontMetrics, LinearGradient, ListMarker,
-    MediaFeatures, Position, RadialGradient, Size, TextTransform,
+    BackgroundLayer, BorderRadiuses, Borders, Color, ConicGradient, DocumentContainer, DrawContext,
+    FontDescription, FontHandle, FontMetrics, LinearGradient, ListMarker, MediaFeatures, Position,
+    RadialGradient, Size, TextTransform,
 };
 
 const USER_AGENT: &str = "Mozilla/5.0 (X11; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0";
@@ -92,7 +92,14 @@ impl DocumentContainer for BrowseContainer {
     fn text_width(&self, text: &str, font: FontHandle) -> f32 {
         self.inner.text_width(text, font)
     }
-    fn draw_text(&mut self, hdc: DrawContext, text: &str, font: FontHandle, color: Color, pos: Position) {
+    fn draw_text(
+        &mut self,
+        hdc: DrawContext,
+        text: &str,
+        font: FontHandle,
+        color: Color,
+        pos: Position,
+    ) {
         self.inner.draw_text(hdc, text, font, color, pos);
     }
     fn draw_list_marker(&mut self, hdc: DrawContext, marker: &ListMarker) {
@@ -140,7 +147,13 @@ impl DocumentContainer for BrowseContainer {
     ) {
         self.inner.draw_conic_gradient(hdc, layer, gradient);
     }
-    fn draw_borders(&mut self, hdc: DrawContext, borders: &Borders, draw_pos: Position, root: bool) {
+    fn draw_borders(
+        &mut self,
+        hdc: DrawContext,
+        borders: &Borders,
+        draw_pos: Position,
+        root: bool,
+    ) {
         self.inner.draw_borders(hdc, borders, draw_pos, root);
     }
     fn set_base_url(&mut self, base_url: &str) {

litehtml/src/email.rs

@@ -3,7 +3,7 @@
 //! Provides an email user-agent stylesheet and a convenience pipeline
 //! that wraps [`crate::html::prepare_html`] with email-specific defaults.
 
-use crate::html;
+use crate::html::{self, ByteResolver};
 
 // ---------------------------------------------------------------------------
 // Email user-agent stylesheet
@@ -28,8 +28,8 @@ p, h1, h2, h3, h4, h5, h6 { margin: 0; padding: 0; }\n\
 /// in email-specific codebases.
 pub fn prepare_email_html(
     raw: &[u8],
-    cid_resolver: Option<&dyn Fn(&str) -> Option<Vec<u8>>>,
-    url_fetcher: Option<&dyn Fn(&str) -> Option<Vec<u8>>>,
+    cid_resolver: ByteResolver<'_>,
+    url_fetcher: ByteResolver<'_>,
 ) -> PreparedEmail {
     let prepared = html::prepare_html(raw, cid_resolver, url_fetcher);
     PreparedEmail {

litehtml/src/html.rs

@@ -7,6 +7,9 @@
 use base64::Engine;
 use encoding_rs::Encoding;
 
+/// Callback type for resolving a URI string to raw bytes.
+pub type ByteResolver<'a> = Option<&'a dyn Fn(&str) -> Option<Vec<u8>>>;
+
 // ---------------------------------------------------------------------------
 // Encoding detection & conversion
 // ---------------------------------------------------------------------------
@@ -73,12 +76,10 @@ fn detect_meta_charset(html: &str) -> Option<&'static Encoding> {
         let rest = rest.strip_prefix('=')?;
         let rest = rest.trim_start();
         // Strip optional quotes
-        let (encoding_name, _) = if rest.starts_with('"') {
-            let inner = &rest[1..];
+        let (encoding_name, _) = if let Some(inner) = rest.strip_prefix('"') {
             let end = inner.find('"').unwrap_or(inner.len());
             (&inner[..end], &inner[end..])
-        } else if rest.starts_with('\'') {
-            let inner = &rest[1..];
+        } else if let Some(inner) = rest.strip_prefix('\'') {
             let end = inner.find('\'').unwrap_or(inner.len());
             (&inner[..end], &inner[end..])
         } else {
@@ -236,12 +237,10 @@ fn is_stylesheet_link(tag_content: &str) -> bool {
         let rest = lower[pos + 3..].trim_start();
         if let Some(rest) = rest.strip_prefix('=') {
             let rest = rest.trim_start();
-            let val = if rest.starts_with('"') {
-                let inner = &rest[1..];
+            let val = if let Some(inner) = rest.strip_prefix('"') {
                 let end = inner.find('"').unwrap_or(inner.len());
                 &inner[..end]
-            } else if rest.starts_with('\'') {
-                let inner = &rest[1..];
+            } else if let Some(inner) = rest.strip_prefix('\'') {
                 let end = inner.find('\'').unwrap_or(inner.len());
                 &inner[..end]
             } else {
@@ -492,8 +491,8 @@ pub type CidResolver = Box<dyn Fn(&str) -> Option<Vec<u8>>>;
 /// - Remote URLs return `None` when no fetcher is given (no external fetching by default).
 pub fn resolve_image_uri(
     uri: &str,
-    cid_resolver: Option<&dyn Fn(&str) -> Option<Vec<u8>>>,
-    url_fetcher: Option<&dyn Fn(&str) -> Option<Vec<u8>>>,
+    cid_resolver: ByteResolver<'_>,
+    url_fetcher: ByteResolver<'_>,
 ) -> Option<Vec<u8>> {
     if uri.starts_with("data:") {
         decode_data_uri(uri)
@@ -544,16 +543,14 @@ fn preprocess_body_bgcolor(html: &str) -> String {
     let rest = rest.trim_start();
 
     // Extract the value (may be quoted or unquoted)
-    let (value, attr_end_offset) = if rest.starts_with('"') {
-        let inner = &rest[1..];
+    let (value, attr_end_offset) = if let Some(inner) = rest.strip_prefix('"') {
         let end = inner.find('"').unwrap_or(inner.len());
         (
             &tag[bg_pos + 7 + (tag_lower.len() - bg_pos - 7 - rest.len()) + 1
                 ..bg_pos + 7 + (tag_lower.len() - bg_pos - 7 - rest.len()) + 1 + end],
             end + 2,
         )
-    } else if rest.starts_with('\'') {
-        let inner = &rest[1..];
+    } else if let Some(inner) = rest.strip_prefix('\'') {
         let end = inner.find('\'').unwrap_or(inner.len());
         (
             &tag[bg_pos + 7 + (tag_lower.len() - bg_pos - 7 - rest.len()) + 1
@@ -659,16 +656,14 @@ fn preprocess_cellpadding(html: &str) -> String {
         }
         let rest = rest[1..].trim_start();
 
-        let (value, _val_len) = if rest.starts_with('"') {
-            let inner = &rest[1..];
+        let (value, _val_len) = if let Some(inner) = rest.strip_prefix('"') {
             let end = inner.find('"').unwrap_or(inner.len());
             (
                 &html[abs_pos + 11 + (lower.len() - abs_pos - 11 - rest.len()) + 1
                     ..abs_pos + 11 + (lower.len() - abs_pos - 11 - rest.len()) + 1 + end],
                 end + 2,
             )
-        } else if rest.starts_with('\'') {
-            let inner = &rest[1..];
+        } else if let Some(inner) = rest.strip_prefix('\'') {
             let end = inner.find('\'').unwrap_or(inner.len());
             (
                 &html[abs_pos + 11 + (lower.len() - abs_pos - 11 - rest.len()) + 1
@@ -773,8 +768,8 @@ pub struct PreparedHtml {
 /// Without a fetcher, remote URIs are skipped (no external fetching by default).
 pub fn prepare_html(
     raw: &[u8],
-    cid_resolver: Option<&dyn Fn(&str) -> Option<Vec<u8>>>,
-    url_fetcher: Option<&dyn Fn(&str) -> Option<Vec<u8>>>,
+    cid_resolver: ByteResolver<'_>,
+    url_fetcher: ByteResolver<'_>,
 ) -> PreparedHtml {
     let decoded = decode_html(raw);
     let preprocessed = preprocess_attrs(&decoded);
@@ -794,12 +789,10 @@ pub fn prepare_html(
         }
 
         let rest = &sanitized[abs_pos..];
-        let (uri, _) = if rest.starts_with('"') {
-            let inner = &rest[1..];
+        let (uri, _) = if let Some(inner) = rest.strip_prefix('"') {
             let end = inner.find('"').unwrap_or(inner.len());
             (&inner[..end], end + 2)
-        } else if rest.starts_with('\'') {
-            let inner = &rest[1..];
+        } else if let Some(inner) = rest.strip_prefix('\'') {
             let end = inner.find('\'').unwrap_or(inner.len());
             (&inner[..end], end + 2)
         } else {

litehtml/src/lib.rs

@@ -1247,7 +1247,14 @@ pub trait DocumentContainer {
     fn text_width(&self, text: &str, font: FontHandle) -> f32;
 
     /// Draw `text` at `pos` using `font` and `color`.
-    fn draw_text(&mut self, hdc: DrawContext, text: &str, font: FontHandle, color: Color, pos: Position);
+    fn draw_text(
+        &mut self,
+        hdc: DrawContext,
+        text: &str,
+        font: FontHandle,
+        color: Color,
+        pos: Position,
+    );
 
     /// Convert typographic points to device pixels.
     fn pt_to_px(&self, pt: f32) -> f32 {
@@ -1276,7 +1283,8 @@ pub trait DocumentContainer {
     }
 
     /// Draw a background image layer.
-    fn draw_image(&mut self, hdc: DrawContext, layer: &BackgroundLayer, url: &str, base_url: &str) {}
+    fn draw_image(&mut self, hdc: DrawContext, layer: &BackgroundLayer, url: &str, base_url: &str) {
+    }
 
     /// Draw a solid color background layer.
     fn draw_solid_fill(&mut self, hdc: DrawContext, layer: &BackgroundLayer, color: Color) {}
@@ -1309,7 +1317,14 @@ pub trait DocumentContainer {
     }
 
     /// Draw element borders.
-    fn draw_borders(&mut self, hdc: DrawContext, borders: &Borders, draw_pos: Position, root: bool) {}
+    fn draw_borders(
+        &mut self,
+        hdc: DrawContext,
+        borders: &Borders,
+        draw_pos: Position,
+        root: bool,
+    ) {
+    }
 
     /// Set the document title.
     fn set_caption(&mut self, caption: &str) {}
@@ -1499,9 +1514,13 @@ unsafe extern "C" fn cb_draw_text(
     let _ = catch_unwind(AssertUnwindSafe(|| {
         let bridge = bridge_from_user_data(user_data);
         let text = c_str_to_str(text);
-        bridge
-            .container
-            .draw_text(DrawContext(hdc), text, FontHandle(h_font), Color::from(color), Position::from(pos));
+        bridge.container.draw_text(
+            DrawContext(hdc),
+            text,
+            FontHandle(h_font),
+            Color::from(color),
+            Position::from(pos),
+        );
     }));
 }
 
@@ -1586,7 +1605,9 @@ unsafe extern "C" fn cb_draw_image(
         let layer = BackgroundLayer::from_ptr(layer);
         let url = c_str_to_str(url);
         let base_url = c_str_to_str(base_url);
-        bridge.container.draw_image(DrawContext(hdc), &layer, url, base_url);
+        bridge
+            .container
+            .draw_image(DrawContext(hdc), &layer, url, base_url);
     }));
 }
 
@@ -1647,7 +1668,9 @@ unsafe extern "C" fn cb_draw_conic_gradient(
         let bridge = bridge_from_user_data(user_data);
         let layer = BackgroundLayer::from_ptr(layer);
         let gradient = ConicGradient::from_ptr(gradient);
-        bridge.container.draw_conic_gradient(DrawContext(hdc), &layer, &gradient);
+        bridge
+            .container
+            .draw_conic_gradient(DrawContext(hdc), &layer, &gradient);
     }));
 }
 
@@ -1661,9 +1684,12 @@ unsafe extern "C" fn cb_draw_borders(
     let _ = catch_unwind(AssertUnwindSafe(|| {
         let bridge = bridge_from_user_data(user_data);
         let borders = Borders::from(borders);
-        bridge
-            .container
-            .draw_borders(DrawContext(hdc), &borders, Position::from(draw_pos), root != 0);
+        bridge.container.draw_borders(
+            DrawContext(hdc),
+            &borders,
+            Position::from(draw_pos),
+            root != 0,
+        );
     }));
 }