diff --git a/Cargo.lock b/Cargo.lock index 3f5b38c8ee..dffa8c67c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5290,8 +5290,7 @@ dependencies = [ [[package]] name = "syntect" version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656b45c05d95a5704399aeef6bd0ddec7b2b3531b7c9e900abbf7c4d2190c925" +source = "git+https://github.com/tontinton/syntect?rev=01df275f6f25da670e5ba5b7128cb89d03795119#01df275f6f25da670e5ba5b7128cb89d03795119" dependencies = [ "bincode", "fancy-regex 0.16.2", diff --git a/Cargo.toml b/Cargo.toml index 7846cce5e9..f31909d792 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -219,5 +219,11 @@ debug = false # multiline paste submits at the first newline (#336). Pinned to the head of # crossterm-rs/crossterm#1030, which lives in refs/pull/1030/head on the upstream repo. # Remove once the PR ships in a crossterm release. +# +# syntect 5.3.0 spins forever on a JavaScript line like `x /*`: two rules match +# empty at the same byte and `set` each other back, which is neither the push nor +# the pop its loop guard watches, so one such line pins a core at 100% for good. +# Pinned to a v5.3.0 backport of trishume/syntect#706, remove once that ships. [patch.crates-io] crossterm = { git = "https://github.com/crossterm-rs/crossterm", rev = "3ca54292d2b1f1c58e200a06122ddaf5dd6b5c77" } +syntect = { git = "https://github.com/tontinton/syntect", rev = "01df275f6f25da670e5ba5b7128cb89d03795119" } diff --git a/flake.nix b/flake.nix index 91f89e257a..d6137047be 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,8 @@ "sha256-P4PgqfYykkZrWGg5G3WQo070lORLEhmXQUQPx3+Yslo="; "git+https://github.com/crossterm-rs/crossterm?rev=3ca54292d2b1f1c58e200a06122ddaf5dd6b5c77#3ca54292d2b1f1c58e200a06122ddaf5dd6b5c77" = "sha256-A5lgiEEi7mktf7m2GljdAxst7Fdl7Uqko29Xq6o90Ow="; + "git+https://github.com/tontinton/syntect?rev=01df275f6f25da670e5ba5b7128cb89d03795119#01df275f6f25da670e5ba5b7128cb89d03795119" = + "sha256-ZszhXL+Bd0zZGOfOodvP4z6dLD3jJr3pO07riwFUC70="; }; missingGitDepHashes = builtins.filter (s: !(builtins.hasAttr s gitDepHashes)) gitDepSources;