build(deps): bump the rust-dependencies group across 1 directory with 11 updates

[dependabot]

Bumps the rust-dependencies group with 11 updates in the / directory:

Package	From	To
tree-sitter	0.22.5	0.22.6
unicode-width	0.1.11	0.1.12
hashbrown	0.14.3	0.14.5
serde	1.0.198	1.0.200
parking_lot	0.12.1	0.12.2
anyhow	1.0.82	1.0.83
libc	0.2.153	0.2.154
rustix	0.38.32	0.38.34
pulldown-cmark	0.10.0	0.10.3
thiserror	1.0.58	1.0.60
cc	1.0.95	1.0.97

Updates tree-sitter from 0.22.5 to 0.22.6

Release notes

Sourced from tree-sitter's releases.

v0.22.6

[0.22.6] — 2024-05-05

Features

• Improve handling of serialization buffer overflows (tree-sitter/tree-sitter#3318)
• Reverse iteration through node parents (tree-sitter/tree-sitter#3214)
• cli: Support NO_COLOR (tree-sitter/tree-sitter#3299)
• cli: Add test listing and allow users to parse a specific test number (tree-sitter/tree-sitter#3067)
• grammar: Add "inherits" field if available (tree-sitter/tree-sitter#3295)

Bug Fixes

• Correctly load field data from wasm languages
• Improve error message when the tree-sitter field is malformed
• Don't error out on package.json lookup errors if --no-bindings is passed (tree-sitter/tree-sitter#3323)
• cli: Keep default cc flags in build
• cli: Properly account for multi-grammar repos when using docker to build a wasm parser (tree-sitter/tree-sitter#3337)
• generate: Don't check arbitrarily named dirs
• generate: Take AsRef<Path> for the path parameter to avoid clones (tree-sitter/tree-sitter#3322)
• highlight: Correct signature of ts_highlighter_add_language
• lib: Do not return field names for extras (tree-sitter/tree-sitter#3330)
• lib: Advance the lookahead end byte by 4 when there's an invalid code point (tree-sitter/tree-sitter#3305)
• rust: Update README example (tree-sitter/tree-sitter#3307)
• rust: Use unix + wasi cfg instead of not windows for fd (tree-sitter/tree-sitter#3304)
• test: Allow newlines in between test name and attribute
• wasm: Correct childrenFromFieldXXX method signatures (tree-sitter/tree-sitter#3301)
• xtask: Always bump every crate in tandem
• zig: Make usable as a zig dependency (tree-sitter/tree-sitter#3315)

Documentation

• Mention build command variables
• Swap \s for \\s in query example
• highlight: Typo (tree-sitter/tree-sitter#3290)

Refactor

• tests: Migrate remaining grammar.json tests to grammar.js (tree-sitter/tree-sitter#3325)

Build System and CI

• Add nightly rustfmt to workflow for linting (tree-sitter/tree-sitter#3333)
• Fix address sanitizer step (tree-sitter/tree-sitter#3188)
• deps: Bump cc from 1.0.92 to 1.0.94 in the cargo group (tree-sitter/tree-sitter#3298)
• deps: Bump the cargo group with 6 updates (tree-sitter/tree-sitter#3313)
• xtask: Bump build.zig.zon version when bumping versions

Changelog

Sourced from tree-sitter's changelog.

[0.22.6] — 2024-05-05

Features

• Improve handling of serialization buffer overflows (tree-sitter/tree-sitter#3318)
• Reverse iteration through node parents (tree-sitter/tree-sitter#3214)
• cli: Support NO_COLOR (tree-sitter/tree-sitter#3299)
• cli: Add test listing and allow users to parse a specific test number (tree-sitter/tree-sitter#3067)
• grammar: Add "inherits" field if available (tree-sitter/tree-sitter#3295)

Bug Fixes

• Correctly load field data from wasm languages
• Improve error message when the tree-sitter field is malformed
• Don't error out on package.json lookup errors if --no-bindings is passed (tree-sitter/tree-sitter#3323)
• cli: Keep default cc flags in build
• cli: Properly account for multi-grammar repos when using docker to build a wasm parser (tree-sitter/tree-sitter#3337)
• generate: Don't check arbitrarily named dirs
• generate: Take AsRef<Path> for the path parameter to avoid clones (tree-sitter/tree-sitter#3322)
• highlight: Correct signature of ts_highlighter_add_language
• lib: Do not return field names for extras (tree-sitter/tree-sitter#3330)
• lib: Advance the lookahead end byte by 4 when there's an invalid code point (tree-sitter/tree-sitter#3305)
• rust: Update README example (tree-sitter/tree-sitter#3307)
• rust: Use unix + wasi cfg instead of not windows for fd (tree-sitter/tree-sitter#3304)
• test: Allow newlines in between test name and attribute
• wasm: Correct childrenFromFieldXXX method signatures (tree-sitter/tree-sitter#3301)
• xtask: Always bump every crate in tandem
• zig: Make usable as a zig dependency (tree-sitter/tree-sitter#3315)

Documentation

• Mention build command variables
• Swap \s for \\s in query example
• highlight: Typo (tree-sitter/tree-sitter#3290)

Refactor

• tests: Migrate remaining grammar.json tests to grammar.js (tree-sitter/tree-sitter#3325)

Build System and CI

• Add nightly rustfmt to workflow for linting (tree-sitter/tree-sitter#3333)
• Fix address sanitizer step (tree-sitter/tree-sitter#3188)
• deps: Bump cc from 1.0.92 to 1.0.94 in the cargo group (tree-sitter/tree-sitter#3298)
• deps: Bump the cargo group with 6 updates (tree-sitter/tree-sitter#3313)
• xtask: Bump build.zig.zon version when bumping versions

Commits

• b40f342 0.22.6
• 577d333 feat(cli): add test listing and allow users to parse a specific test number
• 33045ee fix(test): allow newlines in between test name and attribute
• 1e219ff fix(cli): properly account for multi-grammar repos when using docker to build...
• 572cdaa ci: fix address sanitizer step
• 6bfdae0 docs: mention build command variables
• a2d2da3 fix(cli): keep default cc flags in build
• 90ba525 fix(highlight): correct signature of ts_highlighter_add_language
• 67a0439 test: temporarily disable php test
• 3a42c27 ci: add nightly rustfmt to workflow
• Additional commits viewable in compare view

Updates unicode-width from 0.1.11 to 0.1.12

Commits

• 8092f84 Bump to 0.1.12
• 73f816e Merge pull request #41 from Jules-Bertholet/emoji-presentation
• 6b503fa Support emoji presentation sequences
• 3885393 Merge pull request #39 from Jules-Bertholet/no-more-unicodedata
• afd136a Merge pull request #40 from Jules-Bertholet/document-widths
• 1e623c5 Cargo.toml: make license SPDX-compliant
• f702502 Cargo.toml: add categories
• 8c0c8a1 Document width rules
• 787fed3 unicode.py: Don't use UnicodeData.txt anymore
• 00ee4b0 Merge pull request #38 from Jules-Bertholet/refactor-tests
• Additional commits viewable in compare view

Updates hashbrown from 0.14.3 to 0.14.5

Changelog

Sourced from hashbrown's changelog.

[v0.14.5] - 2024-04-28

Fixed

• Fixed index calculation in panic guard of clone_from_impl. (#511)

[v0.14.4] - 2024-03-19

This release was yanked due to a breaking change.

Commits

• 025d0f5 Bump version number in Cargo.toml to 0.14.5
• 8971805 Revert "Make HashSet::insert return OccupiedEntry"
• 250040a Auto merge of #521 - Amanieu:release-0.14.5, r=Amanieu
• 232df8c Adjust Github CI since macos-latest is now AArch64
• adae598 Reapply "Make HashSet::insert return OccupiedEntry"
• 47ef09f Release v0.14.5
• 3de77e8 Revert "Make HashSet::insert return OccupiedEntry"
• 97c2140 Auto merge of #516 - JohnEndson:master, r=Amanieu
• 1833798 Fix some comments
• 3741813 Auto merge of #512 - Amanieu:release-0.14.4, r=Amanieu
• Additional commits viewable in compare view

Updates serde from 1.0.198 to 1.0.200

Release notes

Sourced from serde's releases.

v1.0.200

• Fix formatting of "invalid type" and "invalid value" deserialization error messages containing NaN or infinite floats (#2733, thanks @​jamessan)

v1.0.199

• Fix ambiguous associated item when forward_to_deserialize_any! is used on an enum with Error variant (#2732, thanks @​aatifsyed)

Commits

• cc865ac Release 1.0.200
• 2d973c1 Merge pull request #2733 from jamessan/nan-decimal
• 6ca499b Only format Unexpected::Float with decimal point if it is finite
• 1477028 Release 1.0.199
• 789740b Merge pull request #2732 from aatifsyed/master
• 8fe7539 fix: ambiguous associated type in forward_to_deserialize_any!
• f6623a3 Ignore cast_precision_loss pedantic clippy lint
• See full diff in compare view

Updates parking_lot from 0.12.1 to 0.12.2

Changelog

Sourced from parking_lot's changelog.

parking_lot 0.12.2, parking_lot_core 0.9.10, lock_api 0.4.12 (2024-04-15)

• Fixed panic when calling with_upgraded twice on a ArcRwLockUpgradableReadGuard (#431)
• Fixed RwLockUpgradeableReadGuard::with_upgraded
• Added lock_api::{Mutex, ReentrantMutex, RwLock}::from_raw methods (#429)
• Added Apple visionOS support (#433)

parking_lot_core 0.9.9, lock_api 0.4.11 (2023-10-18)

• Fixed RwLockUpgradeableReadGuard::with_upgraded. (#393)
• Fixed ReentrantMutex::bump lock count. (#390)
• Added methods to unsafely create a lock guard out of thin air. (#403)
• Added support for Apple tvOS. (#405)

parking_lot_core 0.9.8, lock_api 0.4.10 (2023-06-05)

• Mark guards with #[clippy::has_significant_drop] (#369, #371)
• Removed windows-sys dependency (#374, #378)
• Add atomic_usize default feature to support platforms without atomics. (#380)
• Add with_upgraded API to upgradable read locks (#386)
• Make RwLock guards Sync again (#370)

parking_lot_core 0.9.7 (2023-02-01)

• Update windows-sys dependency to 0.45. (#368)

parking_lot_core 0.9.6 (2023-01-11)

• Add support for watchOS. (#367)

parking_lot_core 0.9.5 (2022-11-29)

• Update use of libc::timespec to prepare for future libc version (#363)

parking_lot_core 0.9.4 (2022-10-18)

• Bump windows-sys dependency to 0.42. (#356)

lock_api 0.4.9 (2022-09-20)

• Fixed ReentrantMutexGuard::try_map signature (#355)

lock_api 0.4.8 (2022-08-28)

• Fixed unsound Sync/Send impls for ArcMutexGuard. (#349)
• Added ArcMutexGuard::into_arc. (#350)

Commits

• 9dace42 Release parking_lot 0.12.2, parking_lot_core 0.9.10, lock_api 0.4.12
• 4f898be Merge pull request #435 from sorcio/wasm-atomics-feature
• 9ee3a54 stdarch_wasm_atomic_wait instead of stdsimd
• 7aeb2f1 Merge pull request #433 from QuentinPerez/master
• c0a9077 Add Apple visionOS support
• 7ab94b6 Merge pull request #432 from alex/patch-1
• 75a97b2 Update redox_syscall dependency version
• 66d025b Merge pull request #431 from mbyzhang/master
• cd7bda0 Merge pull request #429 from waywardmonkeys/fix-typos
• 1bb45aa Fix panic when calling with_upgraded twice on a ArcRwLockUpgradableReadGuard
• Additional commits viewable in compare view

Updates anyhow from 1.0.82 to 1.0.83

Release notes

Sourced from anyhow's releases.

1.0.83

• Integrate compile-time checking of cfgs (#363)

Commits

• 96f0392 Release 1.0.83
• 17bbd1e Merge pull request #363 from dtolnay/checkcfg
• 3ab3c3b Resolve unexpected_cfgs warning
• 8e62244 Discard CI coverage of backtrace feature on toolchains older than 1.63
• e77374f Mirror PR 343 changes from readme to rustdoc
• cb47d7c Reword no-std documentation change from PR 343
• 6b5bdb1 Wrap PR 343 to 80 columns
• f01080b Merge pull request #343 from Arthur-Milchior/readme1
• See full diff in compare view

Updates libc from 0.2.153 to 0.2.154

Release notes

Sourced from libc's releases.

0.2.154

What's Changed

• Fix CI on v0.2 by @​JohnTitor in rust-lang/libc#3589
• [Backport #3547] Add ioctl FS_IOC_{G,S}{ETVERSION,ETFLAGS} for CSKY by @​Dirreke in rust-lang/libc#3572
• Add Linux riscv64 HWCAP defines (libc-0.2) by @​Xeonacid in rust-lang/libc#3580
• Add missing MIPS R6 FS_IOC_* definitions by @​chenx97 in rust-lang/libc#3591
• Support posix_spawn on Android by @​pcc in rust-lang/libc#3602
• [0.2] Fix libc-tests for loongarch64 by @​heiher in rust-lang/libc#3607
• visionOS Support by @​agg23 in rust-lang/libc#3568
• [0.2] linux/musl: Add support for LoongArch64 by @​heiher in rust-lang/libc#3606
• v0.2: Fix c_char on AIX by @​taiki-e in rust-lang/libc#3662
• solarish adding SO_EXCLBIND constant. by @​devnexen in rust-lang/libc#3651
• [0.2] Add SIG constants to espidf by @​Tevz-Beskovnik in rust-lang/libc#3658
• add all android sysconf constants by @​fkm3 in rust-lang/libc#3656
• feat: more _PC_XXX constants for apple targets by @​SteveLauC in rust-lang/libc#3649
• feat: O_EXEC/O_SEARCH for apple platforms by @​SteveLauC in rust-lang/libc#3668
• [0.2] Add constant AT_MINSIGSTKSZ by @​ur4t in rust-lang/libc#3637
• Haiku: synchronize with post R1-beta 4 changes in libc by @​nielx in rust-lang/libc#3638
• adding getentropy/getrandom to dragonflybsd. by @​devnexen in rust-lang/libc#3618
• Move strftime, strftime_l, strptime to linux_like by @​pcc in rust-lang/libc#3600
• update crate version to 0.2.154 by @​Dirreke in rust-lang/libc#3573

New Contributors

• @​pcc made their first contribution in rust-lang/libc#3602
• @​agg23 made their first contribution in rust-lang/libc#3568
• @​Tevz-Beskovnik made their first contribution in rust-lang/libc#3658
• @​ur4t made their first contribution in rust-lang/libc#3637

Full Changelog: rust-lang/libc@0.2.153...0.2.154

Commits

• b78d6a3 Merge pull request #3573 from Dirreke/update-libc0.2
• 3111f6f Merge pull request #3600 from pcc/strtime
• 4d836cc Merge pull request #3618 from devnexen/dfbsd_gtrandom
• 23a1b4c Merge pull request #3638 from nielx/haiku-hrev57593-0.2
• f4ab3e7 Merge pull request #3637 from ur4t/libc-0.2
• 4d6fe50 Move strftime, strftime_l, strptime to linux_like
• e79e95f adding getentropy/getrandom to dragonflybsd.
• 8220683 Double quote variables in shell scripts
• c0a6936 Add constant AT_MINSIGSTKSZ introduced by glibc 2.35
• 1c7f8fc Haiku: synchronize with post R1-beta 4 changes in libc
• Additional commits viewable in compare view

Updates rustix from 0.38.32 to 0.38.34

Commits

• 14a88ef chore: Release rustix version 0.38.34
• 1d28750 Make the libc "extra_traits" feature optional. (#1049)
• 63dd84a chore: Release rustix version 0.38.33
• 95a8302 Probe for statx availability even when statx returns ENOSYS. (#1048)
• 76143e1 Move to using IpAddr and other types from core. (#1047)
• a5af48e Add "visionos" as an apple target. (#1046)
• 48eeb83 Pass null instead of empty slices to getxattr and fgetxattr on macos (#1045)
• fa21a6d Disable Haiku in CI due to upstream breakage, and fix a no_std error. (#1042)
• 6f72de5 Add ELF aux vector AT_MINSIGSTKSZ (#1041)
• 7077238 Expose OFlags::LARGEFILE and document its behavior (#1020)
• Additional commits viewable in compare view

Updates pulldown-cmark from 0.10.0 to 0.10.3

Release notes

Sourced from pulldown-cmark's releases.

v0.10.3

The main change of this release is the simd feature was not being used in the escape functions since the version 0.10 due to a mistake during the separation of the crate pulldown-cmark-escape.

The crate pulldown-cmark-escape has been updated to the version 0.10.1.

What's Changed

• fix: fix dead code warning from nightly compiler by @​rhysd in pulldown-cmark/pulldown-cmark#876
• Eat all spaces after line break in link title by @​notriddle in pulldown-cmark/pulldown-cmark#877
• Mark Rule as a block item by @​notriddle in pulldown-cmark/pulldown-cmark#879

Full Changelog: pulldown-cmark/pulldown-cmark@v0.10.2...v0.10.3

v0.10.2

New release with some fixes and improvements. Note the 0.10.1 is missing (yanked from crates.io) due to a conflict with the clap version and the Rust minimum version (1.74 now instead of 1.70).

Thanks to all people that contributed to this release!

What's Changed

• Limit link def expansion by @​notriddle in pulldown-cmark/pulldown-cmark#845
• Do not look for HTML tags that start with backslash by @​notriddle in pulldown-cmark/pulldown-cmark#849
• Count a blank line at end of indented code block towards list by @​notriddle in pulldown-cmark/pulldown-cmark#851
• Use same limit for refdef as inline links by @​notriddle in pulldown-cmark/pulldown-cmark#854
• Don't exit scan_attribute with the ix pointing at block quote by @​notriddle in pulldown-cmark/pulldown-cmark#858
• Check indentation on the closing fence relative to the line by @​notriddle in pulldown-cmark/pulldown-cmark#862
• Adjust strikethrough flanking rule to better fit Rustdoc Crater run by @​notriddle in pulldown-cmark/pulldown-cmark#864
• perf: cargo-wizard default recommendations for runtime perf by @​Martin1887 in pulldown-cmark/pulldown-cmark#868

New Contributors

• @​ehuss made their first contribution in pulldown-cmark/pulldown-cmark#848
• @​jimblandy made their first contribution in pulldown-cmark/pulldown-cmark#865
• @​max-heller made their first contribution in pulldown-cmark/pulldown-cmark#866
• @​blinxen made their first contribution in pulldown-cmark/pulldown-cmark#875

Full Changelog: pulldown-cmark/pulldown-cmark@v0.10.0...v0.10.2

Commits

• 1cfaf02 fix: simd was not be using after the new crate pulldown-cmark-escape
• eac0027 Merge pull request #879 from notriddle/notriddle/rule-emph
• d26e07f Mark Rule as a block item
• 6165d35 Merge pull request #877 from notriddle/link-title-break
• e589720 Eat all spaces after line break in link title
• 912405c Merge pull request #876 from rhysd/warn-unused-field
• ac06693 fix: fix dead code warning from nightly compiler
• 8c77390 chore: upgrade Rust minimum version to 1.74
• 7e0e90c chore: update Cargo.lock
• 17ccf97 chore: bump version
• Additional commits viewable in compare view

Updates thiserror from 1.0.58 to 1.0.60

Release notes

Sourced from thiserror's releases.

1.0.60

• Resolve unexpected_cfgs warning (#298)

1.0.59

• Unblock testing of rustc debug-fmt-detail option (#297)

Commits

• 870d11b Release 1.0.60
• 0ccee7c Merge pull request #298 from dtolnay/checkcfg
• cf43d0c Resolve unexpected_cfgs warning
• e7ad85e Release 1.0.59
• af477ec Merge pull request #297 from dtolnay/traitident
• f3fbd99 Implement ToTokens without reliance on {:?}
• 508ece8 Revert "Temporarily disable miri on doctests"
• c8c804c Explicitly install a Rust toolchain for cargo-outdated job
• 6969595 Merge pull request #293 from dtolnay/workspacewrapper
• 488d52f Apply RUSTC_WORKSPACE_WRAPPER
• Additional commits viewable in compare view

Updates cc from 1.0.95 to 1.0.97

Release notes

Sourced from cc's releases.

1.0.97

What's Changed

• CI: Create regenerate-target-info by @​NobodyXu in rust-lang/cc-rs#1055
• Fix file extension for pipelime regenerate-target-info by @​NobodyXu in rust-lang/cc-rs#1056
• Fix running gen-target-info in regenerate-target-info.yml by @​NobodyXu in rust-lang/cc-rs#1057
• Fix regenerate-target-info.yml by @​NobodyXu in rust-lang/cc-rs#1060
• Add support for riscv32ima by @​github-actions in rust-lang/cc-rs#1061
• Fix commit message in regenerate-target-info.yml by @​NobodyXu in rust-lang/cc-rs#1062
• CI: Run cargo-semver-checks for every PR and commits to main by @​NobodyXu in rust-lang/cc-rs#1053
• fix: emscripten build on windows by @​atty303 in rust-lang/cc-rs#1054
• Don't use the value of SDKROOT if it doesn't match the target. by @​jfgoog in rust-lang/cc-rs#1047
• Rm unnecessary println in try_get_compiler by @​NobodyXu in rust-lang/cc-rs#1063
• Bump actions/checkout from 3 to 4 by @​dependabot in rust-lang/cc-rs#1064
• Avoid recursive calls into try_get_compiler when items are in the cache by @​dpaoliello in rust-lang/cc-rs#1050
• Release cc 1.0.97 by @​NobodyXu in rust-lang/cc-rs#1066

New Contributors

• @​github-actions made their first contribution in rust-lang/cc-rs#1061
• @​atty303 made their first contribution in rust-lang/cc-rs#1054

Full Changelog: rust-lang/cc-rs@1.0.96...1.0.97

1.0.96

What's Changed

• Use specified include directories prior to CFLAGS by @​justsmth in rust-lang/cc-rs#1043
• MSVC: Add support for linking against the "spectre-mitigated" CRT by @​dpaoliello in rust-lang/cc-rs#673
• Release cc 1.0.96 by @​NobodyXu in rust-lang/cc-rs#1045

New Contributors

• @​justsmth made their first contribution in rust-lang/cc-rs#1043

Full Changelog: rust-lang/cc-rs@1.0.95...1.0.96

Commits

• 9866310 Release cc 1.0.97 (#1066)
• 385228f Avoid recursive calls into try_get_compiler when items are in the cache (#1050)
• d864140 Bump actions/checkout from 3 to 4 (#1064)
• 8ea8988 Rm unnecessary println in try_get_compiler (#1063)
• 8521a7f Don't use the value of SDKROOT if it doesn't match the target. (#1047)
• 8084e0f fix: emscripten build on windows (#1054)
• 3637304 CI: Run cargo-semver-checks for every PR and commits to main (#1053)
• c1e3268 Fix commit message in regenerate-target-info.yml (#1062)
• 01c7850 dep: Regenerate target info (#1061)
• 0d096e5 Fix regenerate-target-info.yml (#1060)
• Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

---

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
• @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
• @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
• @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
• @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
• @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

[pascalkuthe]

The emoji related changes in unicode width make me a bit uncomfortable.

It's not a huge deal but this probaably breaks width calculations for more terminals (alacritty iterm/wezterm with default settings) and fixes then fir other terminals (kitty and probably windows terminal).

I am ok with merging them for now. but we really need to revisit that. I have some compatability hack in mind that will make our rendering more efficient, fixes a bunch of bugs and makes us compatible with everything (but doesn't render multi codepoint graphemes correctly but they are broken to begin with)