yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

markdown: Bump merman version (#62236)

Browse Source 
bump merman to 0.7 (with patch for multibyte chars)

---

Release Notes:

- N/A or Added/Fixed/Improved ...
This commit is contained in:
Cameron Mcloughlin authored and GitHub committed 2026-08-05 20:11:33 +00:00
1 parent 4abf6ef818
commit ea1273b2fa
2 files changed
+33 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+32 -25
View File
@@ -2210,7 +2210,7 @@ dependencies = [
"bitflags 2.13.1",
"cexpr",
"clang-sys",
"itertools 0.11.0",
"itertools 0.10.5",
"log",
"prettyplease",
"proc-macro2",
@@ -2230,7 +2230,7 @@ dependencies = [
"bitflags 2.13.1",
"cexpr",
"clang-sys",
"itertools 0.11.0",
"itertools 0.10.5",
"proc-macro2",
"quote",
"regex",
@@ -5449,22 +5449,25 @@ dependencies = [
[[package]]
name = "dugong"
version = "0.6.2"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
version = "0.7.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"dugong-graphlib",
"rustc-hash 2.1.1",
"serde",
"serde_json",
"web-time",
]
[[package]]
name = "dugong-graphlib"
version = "0.6.2"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
version = "0.7.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"hashbrown 0.16.1",
"rustc-hash 2.1.1",
"serde",
"serde_json",
]
[[package]]
@@ -6114,7 +6117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -7335,7 +7338,7 @@ dependencies = [
"gobject-sys",
"libc",
"system-deps",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -8846,7 +8849,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
"windows-core 0.62.2",
"windows-core 0.56.0",
]
[[package]]
@@ -10776,13 +10779,14 @@ dependencies = [
[[package]]
name = "manatee"
version = "0.6.2"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
version = "0.7.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"indexmap 2.14.0",
"nalgebra",
"rustc-hash 2.1.1",
"thiserror 2.0.17",
"web-time",
]
[[package]]
@@ -11078,9 +11082,10 @@ dependencies = [
[[package]]
name = "merman"
version = "0.6.2"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
version = "0.7.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"chrono",
"merman-core",
"merman-render",
"thiserror 2.0.17",
@@ -11088,8 +11093,8 @@ dependencies = [
[[package]]
name = "merman-core"
version = "0.6.2"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
version = "0.7.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"chrono",
"euclid",
@@ -11110,12 +11115,13 @@ dependencies = [
"tracing",
"url",
"uuid",
"web-time",
]
[[package]]
name = "merman-render"
version = "0.6.2"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
version = "0.7.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -11124,7 +11130,6 @@ dependencies = [
"manatee",
"merman-core",
"pulldown-cmark 0.12.2",
"regex",
"roughr-merman",
"rustc-hash 2.1.1",
"ryu-js",
@@ -11134,6 +11139,7 @@ dependencies = [
"thiserror 2.0.17",
"unicode-width",
"url",
"web-time",
]
[[package]]
@@ -14476,7 +14482,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
dependencies = [
"bytes 1.11.1",
"heck 0.5.0",
"itertools 0.11.0",
"itertools 0.10.5",
"log",
"multimap",
"once_cell",
@@ -14509,7 +14515,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",
@@ -15737,10 +15743,11 @@ dependencies = [
[[package]]
name = "roughr-merman"
version = "0.12.0"
source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
source = "git+https://github.com/zed-industries/merman?tag=v0.7.0-with-patches#a3ed8d9f3fd1d74c802f25ed9edd501743796504"
dependencies = [
"derive_builder",
"euclid",
"getrandom 0.2.16",
"num-traits",
"palette",
"points_on_curve",
@@ -15962,7 +15969,7 @@ dependencies = [
"errno 0.3.14",
"libc",
"linux-raw-sys 0.11.0",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -18571,7 +18578,7 @@ dependencies = [
"getrandom 0.3.4",
"once_cell",
"rustix 1.1.2",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -19498,7 +19505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fb391ac70462b3097a755618fbf9c8f95ecc1eb379a414f7b46f202ed10db1f"
dependencies = [
"cc",
"windows-targets 0.52.6",
"windows-targets 0.48.5",
]
[[package]]
@@ -21603,7 +21610,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.52.0",
"windows-sys 0.48.0",
]
[[package]]
crates/mermaid_render/Cargo.toml
+1 -1
View File
@@ -18,7 +18,7 @@ test-support = []
[dependencies]
anyhow.workspace = true
gpui.workspace = true
merman = { git = "https://github.com/zed-industries/merman", tag = "v0.6.2-with-patches", features = ["render"] }
merman = { git = "https://github.com/zed-industries/merman", tag = "v0.7.0-with-patches", features = ["render"] }
quick-xml.workspace = true
serde_json.workspace = true
tracing.workspace = true