html-to-markdown 2.24.1 → 2.24.3

data/rust-vendor/find-msvc-tools/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"01ceb6705b8d38522b73e8d6ea35656e6a983b60dc138f0f1069e65566b8950d","CHANGELOG.md":"26156ba2a5c45087982d4c2887bf19d53cdfaccb312a8c5e322162712d155b77","Cargo.lock":"41fb9a7a5c9017cdf4e41d93f547ba189b6496b4944dbee46c682aff272431a7","Cargo.toml":"34c83e2c96d4b610e3212597e268536db6516ffa1f0a1e7049f194faf46d328d","Cargo.toml.orig":"f0bcba7b7f3d9ebc20437d418ce5816bd3e311c35310eeb1277a90356165cdbc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"5e7b2b1f5ffc1da7695d3e151a2d4d0b8f681e65a24ddf85a353d4bcfa81967a","src/com.rs":"d71a248866e04a19c62221999f7f120890cb98bc74ea7fd0b714f766d3e0dd81","src/find_tools.rs":"45fb0ae0e72bc0cacacf937fd38ea49a208eb60150d4ff613b2ba9685857516a","src/lib.rs":"56b0350126ad84accee5fd3d160c6a04a32d17012013fc6f687caf4b59a76ce8","src/registry.rs":"ccbb665b60517a62d249dbe708675ea915c423c14bea786e17efee27453afd41","src/setup_config.rs":"5fee84b80d089ae4a92f10080b072ea2bb32c2edbcdc759cb9072e380404fc46","src/tool.rs":"83e805a8354278837c474c0907b8dd80c496ae4812b2f777f2b2e4266ba68032","src/vs_instances.rs":"10a4433ff6799b11dc01da568ba20af9153aa645d9dc4154cf1c0da15308577c","src/winapi.rs":"d486d80ebe222f3bf61bba50038cf63b258585325b29b89d149de8b5a489c2b5","src/windows_link.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee","src/windows_sys.rs":"c3c803c6408795eb3a2bb3feaf3dc83a8d3049d76f026a4d25d21162fdb890dd"},"package":"8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"}
+{"files":{".cargo_vcs_info.json":"a6a00e4fc7a085688fcd4550501bc164e55a5f6b84225a5a744d4124dd493e3d","CHANGELOG.md":"d8241689c2a2901c42c6c2284659915ed85e4c36216c1d5d771fa0be9c64a4a9","Cargo.lock":"ee3c45e2461f086b0122abd500f2c55bf9d05876ea6323b951578080cd158838","Cargo.toml":"1162710613011a622ba62b035b570cc13584516082f9cf579cfaf2f144a77a76","Cargo.toml.orig":"3941ba1194442678125b6ca4221a07ac27ac64f7dadd7467490e55e39cc205f9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"5e7b2b1f5ffc1da7695d3e151a2d4d0b8f681e65a24ddf85a353d4bcfa81967a","src/com.rs":"d71a248866e04a19c62221999f7f120890cb98bc74ea7fd0b714f766d3e0dd81","src/find_tools.rs":"4b97e6f518943d4754ac73c77bc5932025bd1b48d10ed310694ed7d7449ae256","src/lib.rs":"56b0350126ad84accee5fd3d160c6a04a32d17012013fc6f687caf4b59a76ce8","src/registry.rs":"ccbb665b60517a62d249dbe708675ea915c423c14bea786e17efee27453afd41","src/setup_config.rs":"5fee84b80d089ae4a92f10080b072ea2bb32c2edbcdc759cb9072e380404fc46","src/tool.rs":"83e805a8354278837c474c0907b8dd80c496ae4812b2f777f2b2e4266ba68032","src/vs_instances.rs":"10a4433ff6799b11dc01da568ba20af9153aa645d9dc4154cf1c0da15308577c","src/winapi.rs":"d486d80ebe222f3bf61bba50038cf63b258585325b29b89d149de8b5a489c2b5","src/windows_link.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee","src/windows_sys.rs":"c3c803c6408795eb3a2bb3feaf3dc83a8d3049d76f026a4d25d21162fdb890dd"},"package":"5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"}

data/rust-vendor/find-msvc-tools/.cargo_vcs_info.json

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "5be292b6bbaddda74e2196b5679d9e7ba5834604"
+    "sha1": "0767349e1d1253e6849b4c2af2059db661f54343"
   },
   "path_in_vcs": "find-msvc-tools"
 }

data/rust-vendor/find-msvc-tools/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.9](https://github.com/rust-lang/cc-rs/compare/find-msvc-tools-v0.1.8...find-msvc-tools-v0.1.9) - 2026-01-30
+
+### Other
+
+- Add `find_windows_sdk` API ([#1663](https://github.com/rust-lang/cc-rs/pull/1663))
+
 ## [0.1.8](https://github.com/rust-lang/cc-rs/compare/find-msvc-tools-v0.1.7...find-msvc-tools-v0.1.8) - 2026-01-16
 
 ### Other

data/rust-vendor/find-msvc-tools/Cargo.lock

@@ -4,4 +4,4 @@ version = 3
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.9"

data/rust-vendor/find-msvc-tools/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2018"
 rust-version = "1.63"
 name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.9"
 build = false
 autolib = false
 autobins = false

data/rust-vendor/find-msvc-tools/Cargo.toml.orig

@@ -1,6 +1,6 @@
 [package]
 name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.9"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cc-rs"

data/rust-vendor/find-msvc-tools/src/find_tools.rs

@@ -18,7 +18,7 @@ use std::{
     env,
     ffi::{OsStr, OsString},
     ops::Deref,
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::Command,
     sync::Arc,
 };
@@ -195,6 +195,46 @@ pub fn find_tool_with_env(full_arch: &str, tool: &str, env_getter: &dyn EnvGette
         .or_else(|| impl_::find_msvc_14(tool, target, env_getter))
 }
 
+/// An SDK found by [`find_windows_sdk`]
+#[derive(Default)]
+pub struct Sdk {
+    libs: Vec<PathBuf>,
+    path: Vec<PathBuf>,
+    include: Vec<PathBuf>,
+    version: String,
+}
+
+impl Sdk {
+    /// Directories containing static libraries (e.g. `.lib` files).
+    pub fn libs(&self) -> impl Iterator<Item = &Path> {
+        self.libs.iter().map(PathBuf::as_path)
+    }
+
+    /// Directories containing binaries (`.exe` and `.dll` files).
+    pub fn path(&self) -> impl Iterator<Item = &Path> {
+        self.path.iter().map(PathBuf::as_path)
+    }
+
+    /// Directories containing source headers (e.g. `.h` files)
+    pub fn include(&self) -> impl Iterator<Item = &Path> {
+        self.include.iter().map(PathBuf::as_path)
+    }
+
+    /// The Windows SDK version that was found.
+    pub fn sdk_version(&self) -> &str {
+        &self.version
+    }
+}
+
+/// Find the directories of the latest installed Windows SDK.
+///
+/// It's not necessary to call this if using [`find`] or [`find_tool`] as they will populate the relvant
+/// environment variables with the SDK directories.
+pub fn find_windows_sdk(full_arch: &str) -> Option<Sdk> {
+    let target = TargetArch::new(full_arch)?;
+    impl_::get_sdks(target, &StdEnvGetter)
+}
+
 /// A version of Visual Studio
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[non_exhaustive]
@@ -302,7 +342,7 @@ mod impl_ {
     use std::sync::atomic::{AtomicBool, Ordering};
     use std::sync::Once;
 
-    use super::{EnvGetter, TargetArch};
+    use super::{EnvGetter, Sdk, TargetArch};
     use crate::Tool;
 
     struct MsvcTool {
@@ -312,13 +352,6 @@ mod impl_ {
         include: Vec<PathBuf>,
     }
 
-    #[derive(Default)]
-    struct SdkInfo {
-        libs: Vec<PathBuf>,
-        path: Vec<PathBuf>,
-        include: Vec<PathBuf>,
-    }
-
     struct LibraryHandle(HMODULE);
 
     impl LibraryHandle {
@@ -392,7 +425,7 @@ mod impl_ {
             }
         }
 
-        fn add_sdk(&mut self, sdk_info: SdkInfo) {
+        fn add_sdk(&mut self, sdk_info: Sdk) {
             self.libs.extend(sdk_info.libs);
             self.path.extend(sdk_info.path);
             self.include.extend(sdk_info.include);
@@ -417,7 +450,7 @@ mod impl_ {
         }
     }
 
-    impl SdkInfo {
+    impl Sdk {
         fn find_tool(&self, tool: &str) -> Option<PathBuf> {
             self.path.iter().map(|p| p.join(tool)).find_map(|mut p| {
                 (p.exists() || (p.set_extension(env::consts::EXE_SUFFIX) && p.exists()))
@@ -958,7 +991,7 @@ mod impl_ {
         Some(tool.into_tool(env_getter))
     }
 
-    fn get_sdks(target: TargetArch, env_getter: &dyn EnvGetter) -> Option<SdkInfo> {
+    pub(super) fn get_sdks(target: TargetArch, env_getter: &dyn EnvGetter) -> Option<Sdk> {
         let sub = target.as_vs_arch();
         let (ucrt, ucrt_version) = get_ucrt_dir()?;
 
@@ -969,7 +1002,7 @@ mod impl_ {
             _ => return None,
         };
 
-        let mut info = SdkInfo::default();
+        let mut info = Sdk::default();
 
         info.path
             .push(ucrt.join("bin").join(&ucrt_version).join(host));
@@ -989,6 +1022,7 @@ mod impl_ {
             info.include.push(sdk_include.join("cppwinrt"));
             info.include.push(sdk_include.join("winrt"));
             info.include.push(sdk_include.join("shared"));
+            info.version = version;
         } else if let Some(sdk) = get_sdk81_dir() {
             info.path.push(sdk.join("bin").join(host));
             let sdk_lib = sdk.join("lib").join("winv6.3");
@@ -997,6 +1031,7 @@ mod impl_ {
             info.include.push(sdk_include.join("um"));
             info.include.push(sdk_include.join("winrt"));
             info.include.push(sdk_include.join("shared"));
+            info.version = "8.1".into();
         }
 
         Some(info)
@@ -1018,12 +1053,7 @@ mod impl_ {
 
     // Given a possible MSVC installation directory, we look for the linker and
     // then add the MSVC library path.
-    fn get_tool(
-        tool: &str,
-        path: &Path,
-        target: TargetArch,
-        sdk_info: &SdkInfo,
-    ) -> Option<MsvcTool> {
+    fn get_tool(tool: &str, path: &Path, target: TargetArch, sdk_info: &Sdk) -> Option<MsvcTool> {
         bin_subdir(target)
             .into_iter()
             .map(|(sub, host)| {
@@ -1477,7 +1507,7 @@ mod impl_ {
 mod impl_ {
     use std::{env, ffi::OsStr, path::PathBuf};
 
-    use super::{EnvGetter, TargetArch};
+    use super::{EnvGetter, Sdk, TargetArch};
     use crate::Tool;
 
     /// Finding msbuild.exe tool under unix system is not currently supported.
@@ -1568,4 +1598,9 @@ mod impl_ {
     pub(super) fn get_ucrt_dir() -> Option<(PathBuf, String)> {
         None
     }
+
+    #[inline(always)]
+    pub(super) fn get_sdks(_target: TargetArch, _env_getter: &dyn EnvGetter) -> Option<Sdk> {
+        None
+    }
 }

data/rust-vendor/html-to-markdown-rs/src/converter/handlers/link.rs

@@ -17,7 +17,6 @@ use crate::converter::inline::link::append_markdown_link;
 use crate::converter::main::walk_node;
 use crate::converter::utility::content::{
     collect_link_label_text, escape_link_label, get_text_content, normalize_link_label, normalized_tag_name,
-    truncate_at_char_boundary,
 };
 use crate::options::ConversionOptions;
 use crate::text;
@@ -48,8 +47,6 @@ pub fn handle_link(
     depth: usize,
     dom_ctx: &DomContext,
 ) {
-    const MAX_LINK_LABEL_LEN: usize = 512;
-
     let href_attr = tag
         .attributes()
         .get("href")
@@ -191,11 +188,6 @@ pub fn handle_link(
             label = href.clone();
         }
 
-        if label.len() > MAX_LINK_LABEL_LEN {
-            truncate_at_char_boundary(&mut label, MAX_LINK_LABEL_LEN);
-            label.push('…');
-        }
-
         let escaped_label = escape_link_label(&label);
 
         #[cfg(feature = "visitor")]
@@ -300,7 +292,7 @@ pub fn handle_link(
                 }
                 collector
                     .borrow_mut()
-                    .add_link(href.clone(), label.clone(), title.clone(), rel_attr, attributes_map);
+                    .add_link(href.clone(), label, title.clone(), rel_attr, attributes_map);
             }
         }
     } else {

data/rust-vendor/html-to-markdown-rs/src/converter/inline/link.rs

@@ -5,7 +5,6 @@
 //! - Autolinks for simple URLs like `<https://example.com>`
 //! - Link label escaping for special Markdown characters
 //! - Heading-in-link special handling (wraps link around heading)
-//! - 512-character label truncation with ellipsis
 //! - Visitor callbacks for custom link processing
 //! - Metadata collection for links (links, URLs, titles, rel attributes)
 //! - Block-level content within links (via inline context)
@@ -21,9 +20,6 @@ use tl::{NodeHandle, Parser};
 type Context = crate::converter::Context;
 type DomContext = crate::converter::DomContext;
 
-/// Maximum length for link label before truncation
-const MAX_LINK_LABEL_LEN: usize = 512;
-
 /// Handler for anchor/link elements: `<a>`.
 ///
 /// Processes anchor tags to generate Markdown links:
@@ -57,7 +53,7 @@ pub(crate) fn handle(
 ) {
     // Import helper functions from parent converter module
     use crate::converter::block::heading::{heading_allows_inline_images, push_heading};
-    use crate::converter::utility::content::{normalized_tag_name, truncate_at_char_boundary};
+    use crate::converter::utility::content::normalized_tag_name;
     #[allow(unused_imports)]
     use crate::converter::utility::serialization::serialize_node;
     use crate::converter::{find_single_heading_child, get_text_content, walk_node};
@@ -227,11 +223,6 @@ pub(crate) fn handle(
         }
 
         // Truncate label if it exceeds maximum length
-        if label.len() > MAX_LINK_LABEL_LEN {
-            truncate_at_char_boundary(&mut label, MAX_LINK_LABEL_LEN);
-            label.push('…');
-        }
-
         let escaped_label = escape_link_label(&label);
 
         // Handle visitor callbacks if feature is enabled
@@ -338,7 +329,7 @@ pub(crate) fn handle(
                 }
                 collector
                     .borrow_mut()
-                    .add_link(href.clone(), label.clone(), title.clone(), rel_attr, attributes_map);
+                    .add_link(href.clone(), label, title.clone(), rel_attr, attributes_map);
             }
         }
     } else {

data/rust-vendor/html-to-markdown-rs/src/converter/list/definition.rs

@@ -67,10 +67,20 @@ pub(crate) fn handle_dl(
             };
             crate::converter::walk_node(child_handle, parser, &mut content, options, &child_ctx, depth, dom_ctx);
 
-            if is_definition_term {
-                in_dt_group = true;
-            } else if !is_definition_description {
-                in_dt_group = false;
+            match child_handle.get(parser) {
+                Some(tl::Node::Tag(_)) => {
+                    if is_definition_term {
+                        in_dt_group = true;
+                    } else if !is_definition_description {
+                        in_dt_group = false;
+                    }
+                }
+                Some(tl::Node::Raw(raw)) => {
+                    if !raw.as_utf8_str().trim().is_empty() {
+                        in_dt_group = false;
+                    }
+                }
+                Some(tl::Node::Comment(_)) | None => {}
             }
         }
     }
@@ -156,9 +166,22 @@ pub(crate) fn handle_dd(
         if trimmed.is_empty() {
             output.push_str(":   \n\n");
         } else {
-            output.push_str(":   ");
-            output.push_str(trimmed);
-            output.push_str("\n\n");
+            let mut lines = trimmed.lines();
+            if let Some(first) = lines.next() {
+                output.push_str(":   ");
+                output.push_str(first);
+                output.push('\n');
+            }
+            for line in lines {
+                if line.is_empty() {
+                    output.push('\n');
+                } else {
+                    output.push_str("    ");
+                    output.push_str(line);
+                    output.push('\n');
+                }
+            }
+            output.push('\n');
         }
     } else if !trimmed.is_empty() {
         output.push_str(trimmed);

data/rust-vendor/html-to-markdown-rs/src/converter/semantic/definition_list.rs

@@ -110,10 +110,20 @@ pub fn handle_dl(
                 walk_node(child_handle, parser, &mut content, options, &child_ctx, depth, dom_ctx);
 
                 // Update state for next iteration
-                if is_definition_term {
-                    in_dt_group = true;
-                } else if !is_definition_description {
-                    in_dt_group = false;
+                match child_handle.get(parser) {
+                    Some(tl::Node::Tag(_)) => {
+                        if is_definition_term {
+                            in_dt_group = true;
+                        } else if !is_definition_description {
+                            in_dt_group = false;
+                        }
+                    }
+                    Some(tl::Node::Raw(raw)) => {
+                        if !raw.as_utf8_str().trim().is_empty() {
+                            in_dt_group = false;
+                        }
+                    }
+                    Some(tl::Node::Comment(_)) | None => {}
                 }
             }
         }
@@ -220,9 +230,22 @@ pub fn handle_dd(
             if trimmed.is_empty() {
                 output.push_str(":   \n\n");
             } else {
-                output.push_str(":   ");
-                output.push_str(trimmed);
-                output.push_str("\n\n");
+                let mut lines = trimmed.lines();
+                if let Some(first) = lines.next() {
+                    output.push_str(":   ");
+                    output.push_str(first);
+                    output.push('\n');
+                }
+                for line in lines {
+                    if line.is_empty() {
+                        output.push('\n');
+                    } else {
+                        output.push_str("    ");
+                        output.push_str(line);
+                        output.push('\n');
+                    }
+                }
+                output.push('\n');
             }
         } else if !trimmed.is_empty() {
             // Standalone definition (no preceding dt)

data/rust-vendor/html-to-markdown-rs/tests/issue_199_regressions.rs

@@ -0,0 +1,15 @@
+//! Regression coverage for issue #199.
+
+use html_to_markdown_rs::convert;
+
+#[test]
+fn test_link_label_is_not_truncated() {
+    let label = "a".repeat(600);
+    let html = format!(r#"<a href="https://example.com">{}</a>"#, label);
+
+    let markdown = convert(&html, None).expect("conversion should succeed");
+    let expected = format!("[{}](https://example.com)", label);
+
+    assert!(markdown.contains(&expected));
+    assert!(!markdown.contains('…'));
+}

data/rust-vendor/html-to-markdown-rs/tests/issue_200_regressions.rs

@@ -0,0 +1,36 @@
+//! Regression coverage for issue #200.
+
+use html_to_markdown_rs::convert;
+
+#[test]
+fn test_definition_list_spacing_consistency() {
+    let html1 = r#"
+<div>
+ <dl>
+  <dt>Tags:</dt>
+  <dd>
+   <ul>
+    <li>
+     <a href="https://site.com">php</a>
+    </li>
+    <li>
+     <a href="https://site.com/search/">closure</a>
+    </li>
+   </ul>
+   <button type="button">Add tags</button>
+  </dd>
+ </dl>
+</div>
+"#;
+
+    let html2 = r#"<div><dl><dt>Tags:</dt><dd><ul><li><a href="https://site.com">php</a></li><li><a href="https://site.com/search/">closure</a></li></ul><button type="button">Add tags</button></dd></dl></div>"#;
+
+    let markdown1 = convert(html1, None).expect("conversion should succeed");
+    let markdown2 = convert(html2, None).expect("conversion should succeed");
+
+    assert_eq!(markdown1, markdown2);
+    assert!(markdown1.contains("Tags:"));
+    assert!(markdown1.contains("\n:   - [php]"));
+    assert!(markdown1.contains("\n    - [closure]"));
+    assert!(markdown1.contains("\n    Add tags"));
+}