Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Update `merman` tag SHA (#59360)
Neelc88c83d619c1
diff --git a/Cargo.lock b/Cargo.lockindex 73aedeabdef..cb3f111be90 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2186,7 +2186,7 @@ dependencies = ["bitflags 2.10.0","cexpr","clang-sys",- "itertools 0.11.0",+ "itertools 0.10.5","log","prettyplease","proc-macro2",@@ -2206,7 +2206,7 @@ dependencies = ["bitflags 2.10.0","cexpr","clang-sys",- "itertools 0.11.0",+ "itertools 0.10.5","proc-macro2","quote","regex",@@ -5270,7 +5270,7 @@ dependencies = ["libc","option-ext","redox_users 0.5.2",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -5415,7 +5415,7 @@ dependencies = [[[package]]name = "dugong"version = "0.6.2"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["dugong-graphlib","rustc-hash 2.1.1",@@ -5426,7 +5426,7 @@ dependencies = [[[package]]name = "dugong-graphlib"version = "0.6.2"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["hashbrown 0.16.1","rustc-hash 2.1.1",@@ -6067,7 +6067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -7277,7 +7277,7 @@ dependencies = ["gobject-sys","libc","system-deps",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -8728,7 +8728,7 @@ dependencies = ["js-sys","log","wasm-bindgen",- "windows-core 0.62.2",+ "windows-core 0.56.0",][[package]]@@ -8982,7 +8982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"dependencies = ["equivalent",- "hashbrown 0.16.1",+ "hashbrown 0.15.5","serde","serde_core",]@@ -10610,7 +10610,7 @@ dependencies = [[[package]]name = "manatee"version = "0.6.2"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["indexmap 2.11.4","nalgebra",@@ -10905,7 +10905,7 @@ dependencies = [[[package]]name = "merman"version = "0.6.2"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["merman-core","merman-render",@@ -10915,7 +10915,7 @@ dependencies = [[[package]]name = "merman-core"version = "0.6.2"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["chrono","euclid",@@ -10941,7 +10941,7 @@ dependencies = [[[package]]name = "merman-render"version = "0.6.2"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["base64 0.22.1","chrono",@@ -11144,7 +11144,7 @@ version = "0.6.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -11574,7 +11574,7 @@ version = "0.50.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -14205,7 +14205,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"dependencies = ["bytes 1.11.1","heck 0.5.0",- "itertools 0.11.0",+ "itertools 0.10.5","log","multimap","once_cell",@@ -14238,7 +14238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"dependencies = ["anyhow",- "itertools 0.11.0",+ "itertools 0.10.5","proc-macro2","quote","syn 2.0.117",@@ -15449,7 +15449,7 @@ dependencies = [[[package]]name = "roughr-merman"version = "0.12.0"-source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#06094471f97acb10d0eebf8b92bac19ba2928eea"+source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"dependencies = ["derive_builder","euclid",@@ -15665,7 +15665,7 @@ dependencies = ["errno 0.3.14","libc","linux-raw-sys 0.11.0",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -17098,7 +17098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -18215,7 +18215,7 @@ dependencies = ["getrandom 0.3.4","once_cell","rustix 1.1.2",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -21217,7 +21217,7 @@ version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.48.0",][[package]]diff --git a/crates/mermaid_render/src/mermaid_render.rs b/crates/mermaid_render/src/mermaid_render.rsindex fdd3e80faaa..5dc953c9c88 100644--- a/crates/mermaid_render/src/mermaid_render.rs+++ b/crates/mermaid_render/src/mermaid_render.rs@@ -185,6 +185,15 @@ pub fn render_to_svg(source: &str, theme: &MermaidTheme) -> Result<String> {mod tests {use super::*;+ /// An ER diagram whose attribute-block tokens begin with a multibyte+ /// UTF-8 character (e.g. CJK type/field names) must not panic while the+ /// lexer probes for the two-character `PK`/`FK`/`UK` keys.+ #[test]+ fn er_multibyte_attribute_does_not_crash() {+ let source = "erDiagram\n顧客 {\n 文字列 名前\n}";+ let _ = render_to_svg(source, &MermaidTheme::default());+ }+/// A flowchart with mutually nested subgraphs (`A` contains `B` and `B`/// contains `A`) is an invalid containment cycle. Rendering it must return/// gracefully rather than overflowing the stack and aborting the process.