Merge pull request #265 from jugglerchris/update_edition_2024

Changes for 0.16.7

Author: jugglerchris

CHANGELOG.md

@@ -9,6 +9,11 @@ Possible log types:
 - `[fixed]` for any bug fixes.
 - `[security]` to invite users to upgrade in case of vulnerabilities.
 
+### 0.16.7
+
+- [added] Support `<b>` tags as bold (thanks amir)
+- [changed] Update html5ever to 0.38.0 (thanks mtorromeo)
+
 ### 0.16.6
 
 - [changed] Update html5ever and tendril dependencies.

Cargo.lock

@@ -1,20 +1,20 @@
 [package]
 name = "html2text"
-version = "0.16.6"
+version = "0.16.7"
 authors = ["Chris Emerson <github@mail.nosreme.org>"]
 description = "Render HTML as plain text."
 repository = "https://github.com/jugglerchris/rust-html2text/"
 readme = "README.md"
 documentation = "https://docs.rs/html2text/"
-edition = "2021"
+edition = "2024"
 rust-version = "1.85"
 categories = ["text-processing"]
 
 keywords = ["html", "text"]
 license = "MIT"
 
 [dependencies]
-html5ever = "0.37.1"
+html5ever = "0.38.0"
 tendril = "0.5"
 unicode-width = "0.2"
 backtrace = { version = "0.3", optional=true }

Cargo.toml

@@ -16,8 +16,8 @@ fn default_colour_map(
     use_css_colours: bool,
     no_default_colours: bool,
 ) -> String {
-    use termion::color::*;
     use RichAnnotation::*;
+    use termion::color::*;
     // Explicit CSS colours override any other colours
     let mut have_explicit_colour = no_default_colours;
     let mut start = Vec::new();

examples/html2text.rs

@@ -14,11 +14,11 @@ use parser::parse_style_attribute;
 use types::Importance;
 
 use crate::{
+    ComputedStyle, Specificity, StyleOrigin,
     markup5ever_rcdom::{
         Handle,
         NodeData::{self, Comment, Document, Element},
     },
-    ComputedStyle, Specificity, StyleOrigin,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -179,25 +179,22 @@ impl Selector {
                     _ => false,
                 },
                 SelectorComponent::Star => Self::do_matches(&comps[1..], node),
-                SelectorComponent::CombChild => {
-                    if let Some(parent) = node.get_parent() {
-                        Self::do_matches(&comps[1..], &parent)
-                    } else {
-                        false
-                    }
-                }
-                SelectorComponent::CombDescendant => {
-                    if let Some(parent) = node.get_parent() {
+                SelectorComponent::CombChild => match node.get_parent() {
+                    Some(parent) => Self::do_matches(&comps[1..], &parent),
+                    _ => false,
+                },
+                SelectorComponent::CombDescendant => match node.get_parent() {
+                    Some(parent) => {
                         Self::do_matches(&comps[1..], &parent) || Self::do_matches(comps, &parent)
-                    } else {
-                        false
                     }
-                }
+                    _ => false,
+                },
                 SelectorComponent::NthChild { a, b, sel } => {
-                    let parent = if let Some(parent) = node.get_parent() {
-                        parent
-                    } else {
-                        return false;
+                    let parent = match node.get_parent() {
+                        Some(parent) => parent,
+                        _ => {
+                            return false;
+                        }
                     };
                     let mut idx = 0i32;
                     for child in parent.children.borrow().iter() {
@@ -724,11 +721,12 @@ pub(crate) mod dom_extract {
     use crate::{expanded_name, local_name, ns};
 
     use crate::{
+        Result, TreeMapResult,
         markup5ever_rcdom::{
             Handle,
             NodeData::{self, Comment, Document, Element},
         },
-        tree_map_reduce, Result, TreeMapResult,
+        tree_map_reduce,
     };
 
     use super::StyleData;

src/css.rs

@@ -3,13 +3,13 @@
 use std::{borrow::Cow, ops::Deref, str::FromStr};
 
 use nom::{
+    AsChar, IResult, Parser,
     branch::alt,
     bytes::complete::{tag, take_until},
     character::complete::{self, digit0, digit1},
     combinator::{fail, map, opt, recognize},
     error::ErrorKind,
     multi::{many0, many1, separated_list0},
-    AsChar, IResult, Parser,
 };
 
 #[derive(Debug, PartialEq)]
@@ -175,7 +175,7 @@ pub(crate) struct Declaration {
 
 use crate::css::styles_from_properties;
 
-use super::{types::Importance, PseudoElement, Selector, SelectorComponent, StyleDecl, WhiteSpace};
+use super::{PseudoElement, Selector, SelectorComponent, StyleDecl, WhiteSpace, types::Importance};
 
 #[derive(Debug, PartialEq)]
 pub(crate) struct RuleSet {
@@ -1161,8 +1161,8 @@ pub(crate) fn parse_style_attribute(text: &str) -> crate::Result<Vec<StyleDecl>>
 #[cfg(test)]
 mod test {
     use crate::css::{
-        parser::{Height, Importance, LengthUnit, RuleSet, Selector},
         AttrOperator, PseudoElement, SelectorComponent,
+        parser::{Height, Importance, LengthUnit, RuleSet, Selector},
     };
 
     use super::{Colour, Decl, Declaration, Overflow, PropertyName};

src/css/parser.rs

@@ -522,7 +522,7 @@ impl RenderTableRow {
     }
     /// Return an iterator which returns cells by values (removing
     /// them from the row).
-    fn cells_drain(&mut self) -> impl Iterator<Item = RenderTableCell> {
+    fn cells_drain(&mut self) -> impl Iterator<Item = RenderTableCell> + use<> {
         std::mem::take(&mut self.cells).into_iter()
     }
     /// Count the number of cells in the row.
@@ -2858,15 +2858,15 @@ pub mod config {
     use super::Error;
     use crate::css::types::Importance;
     use crate::css::{Ruleset, Selector, SelectorComponent, Style, StyleData};
+    #[cfg(feature = "css_ext")]
+    use crate::{HighlighterMap, SyntaxHighlighter};
     use crate::{
+        HtmlContext, MIN_WIDTH, RenderTree, Result,
         css::{PseudoContent, PseudoElement, StyleDecl},
         render::text_renderer::{
             PlainDecorator, RichAnnotation, RichDecorator, TaggedLine, TextDecorator,
         },
-        HtmlContext, RenderTree, Result, MIN_WIDTH,
     };
-    #[cfg(feature = "css_ext")]
-    use crate::{HighlighterMap, SyntaxHighlighter};
 
     /// Specify how images with missing or empty alt text are handled
     #[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]

src/lib.rs

@@ -40,10 +40,10 @@ macro_rules! html_trace {
 #[macro_export]
 #[doc(hidden)]
 macro_rules! html_trace {
-    ($fmt:expr) => {
+    ($fmt:expr_2021) => {
         $crate::macros::nop();
     };
-    ($fmt:expr, $( $args:expr ),*) => {
+    ($fmt:expr_2021, $( $args:expr_2021 ),*) => {
         $crate::macros::nop();
     };
 }
@@ -64,10 +64,10 @@ macro_rules! html_trace_quiet {
 #[macro_export]
 #[doc(hidden)]
 macro_rules! html_trace_quiet {
-    ($fmt:expr) => {
+    ($fmt:expr_2021) => {
         $crate::macros::nop();
     };
-    ($fmt:expr, $( $args:expr ),*) => {
+    ($fmt:expr_2021, $( $args:expr_2021 ),*) => {
         $crate::macros::nop();
     };
 }