From 67ed7a9f1831a7e8d1152c6bc1530a37e9f5deec Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Nov 2026 20:19:40 -0500 Subject: [PATCH] Drop the biome fork!!! --- Cargo.lock | 28 +++++++------- Cargo.toml | 12 +++--- crates/oak_db/fuzz/Cargo.lock | 72 +++++++++-------------------------- 3 files changed, 37 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 114ce37af0..e824338e9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,7 +238,7 @@ dependencies = [ [[package]] name = "air_r_factory" version = "0.0.0" -source = "git+https://github.com/posit-dev/air?rev=aa552899dece399c7f6234d0741b66c628696b0f#aa552899dece399c7f6234d0741b66c628696b0f" +source = "git+https://github.com/posit-dev/air?rev=2ef1b8551d2d6a493215e110616a1b3083e5858b#2ef1b8551d2d6a493215e110616a1b3083e5858b" dependencies = [ "air_r_syntax", "biome_rowan", @@ -247,7 +247,7 @@ dependencies = [ [[package]] name = "air_r_parser" version = "0.0.0" -source = "git+https://github.com/posit-dev/air?rev=aa552899dece399c7f6234d0741b66c628696b0f#aa552899dece399c7f6234d0741b66c628696b0f" +source = "git+https://github.com/posit-dev/air?rev=2ef1b8551d2d6a493215e110616a1b3083e5858b#2ef1b8551d2d6a493215e110616a1b3083e5858b" dependencies = [ "air_r_factory", "air_r_syntax", @@ -259,7 +259,7 @@ dependencies = [ [[package]] name = "air_r_syntax" version = "0.0.0" -source = "git+https://github.com/posit-dev/air?rev=aa552899dece399c7f6234d0741b66c628696b0f#aa552899dece399c7f6234d0741b66c628696b0f" +source = "git+https://github.com/posit-dev/air?rev=2ef1b8551d2d6a493215e110616a1b3083e5858b#2ef1b8551d2d6a493215e110616a1b3083e5858b" dependencies = [ "biome_rowan", "serde", @@ -611,7 +611,7 @@ checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] name = "biome_console" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_markup", "biome_text_size", @@ -624,7 +624,7 @@ dependencies = [ [[package]] name = "biome_diagnostics" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "backtrace", "biome_console", @@ -644,7 +644,7 @@ dependencies = [ [[package]] name = "biome_diagnostics_categories" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "quote", "serde", @@ -653,7 +653,7 @@ dependencies = [ [[package]] name = "biome_diagnostics_macros" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -664,7 +664,7 @@ dependencies = [ [[package]] name = "biome_line_index" version = "0.1.0" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_text_size", "rustc-hash", @@ -673,7 +673,7 @@ dependencies = [ [[package]] name = "biome_markup" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -683,7 +683,7 @@ dependencies = [ [[package]] name = "biome_parser" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_console", "biome_diagnostics", @@ -697,7 +697,7 @@ dependencies = [ [[package]] name = "biome_rowan" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_text_edit", "biome_text_size", @@ -709,7 +709,7 @@ dependencies = [ [[package]] name = "biome_text_edit" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_text_size", "serde", @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "biome_text_size" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "serde", ] @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "biome_unicode_table" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" [[package]] name = "bitflags" diff --git a/Cargo.toml b/Cargo.toml index 5b68260e8a..3655bc904c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,10 +25,10 @@ too_many_arguments = "allow" [workspace.dependencies] actix-web = "4.13.0" -aether_factory = { git = "https://github.com/posit-dev/air", package = "air_r_factory", rev = "aa552899dece399c7f6234d0741b66c628696b0f" } +aether_factory = { git = "https://github.com/posit-dev/air", package = "air_r_factory", rev = "2ef1b8551d2d6a493215e110616a1b3083e5858b" } aether_lsp_utils = { path = "crates/aether_lsp_utils" } -aether_parser = { git = "https://github.com/posit-dev/air", package = "air_r_parser", rev = "aa552899dece399c7f6234d0741b66c628696b0f" } -aether_syntax = { git = "https://github.com/posit-dev/air", package = "air_r_syntax", rev = "aa552899dece399c7f6234d0741b66c628696b0f" } +aether_parser = { git = "https://github.com/posit-dev/air", package = "air_r_parser", rev = "2ef1b8551d2d6a493215e110616a1b3083e5858b" } +aether_syntax = { git = "https://github.com/posit-dev/air", package = "air_r_syntax", rev = "2ef1b8551d2d6a493215e110616a1b3083e5858b" } aether_path = { path = "crates/aether_path" } amalthea = { path = "crates/amalthea" } annotate-snippets = "0.12.16" @@ -39,9 +39,9 @@ ark_test = { path = "crates/ark_test" } assert_matches = "1.5.0" async-trait = "0.1.89" base64 = "0.23.1" -biome_line_index = { git = "https://github.com/lionel-/biome", rev = "a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" } -biome_rowan = { git = "https://github.com/lionel-/biome", rev = "a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" } -biome_text_size = { git = "https://github.com/lionel-/biome", rev = "a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" } +biome_line_index = { git = "https://github.com/biomejs/biome", rev = "927eea3d3169214d5fb12c355f99a0ab00e10a20" } +biome_rowan = { git = "https://github.com/biomejs/biome", rev = "927eea3d3169214d5fb12c355f99a0ab00e10a20" } +biome_text_size = { git = "https://github.com/biomejs/biome", rev = "927eea3d3169214d5fb12c355f99a0ab00e10a20" } blake3 = "1.8.5" bus = "2.4.1" camino = "1.1" diff --git a/crates/oak_db/fuzz/Cargo.lock b/crates/oak_db/fuzz/Cargo.lock index 4d6f965bb2..125c749f04 100644 --- a/crates/oak_db/fuzz/Cargo.lock +++ b/crates/oak_db/fuzz/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "air_r_factory" version = "0.0.0" -source = "git+https://github.com/posit-dev/air?rev=d2659d5b158374bf486b594625ca50abbd0ac879#d2659d5b158374bf486b594625ca50abbd0ac879" +source = "git+https://github.com/posit-dev/air?rev=2ef1b8551d2d6a493215e110616a1b3083e5858b#2ef1b8551d2d6a493215e110616a1b3083e5858b" dependencies = [ "air_r_syntax", "biome_rowan", @@ -50,23 +50,19 @@ dependencies = [ [[package]] name = "air_r_parser" version = "0.0.0" -source = "git+https://github.com/posit-dev/air?rev=d2659d5b158374bf486b594625ca50abbd0ac879#d2659d5b158374bf486b594625ca50abbd0ac879" +source = "git+https://github.com/posit-dev/air?rev=2ef1b8551d2d6a493215e110616a1b3083e5858b#2ef1b8551d2d6a493215e110616a1b3083e5858b" dependencies = [ "air_r_factory", "air_r_syntax", "biome_parser", "biome_rowan", - "biome_unicode_table", - "serde", - "tracing", - "tree-sitter", - "tree-sitter-r", + "unicode-ident", ] [[package]] name = "air_r_syntax" version = "0.0.0" -source = "git+https://github.com/posit-dev/air?rev=d2659d5b158374bf486b594625ca50abbd0ac879#d2659d5b158374bf486b594625ca50abbd0ac879" +source = "git+https://github.com/posit-dev/air?rev=2ef1b8551d2d6a493215e110616a1b3083e5858b#2ef1b8551d2d6a493215e110616a1b3083e5858b" dependencies = [ "biome_rowan", "serde", @@ -117,7 +113,7 @@ dependencies = [ [[package]] name = "biome_console" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_markup", "biome_text_size", @@ -130,7 +126,7 @@ dependencies = [ [[package]] name = "biome_diagnostics" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "backtrace", "biome_console", @@ -150,7 +146,7 @@ dependencies = [ [[package]] name = "biome_diagnostics_categories" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "quote", "serde", @@ -159,7 +155,7 @@ dependencies = [ [[package]] name = "biome_diagnostics_macros" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -170,7 +166,7 @@ dependencies = [ [[package]] name = "biome_line_index" version = "0.1.0" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_text_size", "rustc-hash", @@ -179,7 +175,7 @@ dependencies = [ [[package]] name = "biome_markup" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -189,7 +185,7 @@ dependencies = [ [[package]] name = "biome_parser" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_console", "biome_diagnostics", @@ -203,7 +199,7 @@ dependencies = [ [[package]] name = "biome_rowan" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_text_edit", "biome_text_size", @@ -215,7 +211,7 @@ dependencies = [ [[package]] name = "biome_text_edit" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "biome_text_size", "serde", @@ -225,7 +221,7 @@ dependencies = [ [[package]] name = "biome_text_size" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" dependencies = [ "serde", ] @@ -233,7 +229,7 @@ dependencies = [ [[package]] name = "biome_unicode_table" version = "0.5.7" -source = "git+https://github.com/lionel-/biome?rev=a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9#a1296ea6ba363d8b8d8f02181b2a4ce9315c5ef9" +source = "git+https://github.com/biomejs/biome?rev=927eea3d3169214d5fb12c355f99a0ab00e10a20#927eea3d3169214d5fb12c355f99a0ab00e10a20" [[package]] name = "bitflags" @@ -713,9 +709,9 @@ dependencies = [ [[package]] name = "mutatis" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468ca2a8bc8087a0b2c11d21e7dca51d92cc2662a6993d6b56bac2701795f202" +checksum = "a61dd769784c9841c5020894ef75c02b3e747b4818e3c74f5e5362e50dfe5f5b" dependencies = [ "log", "rand 0.8.8", @@ -1210,12 +1206,6 @@ dependencies = [ "log", ] -[[package]] -name = "streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" - [[package]] name = "syn" version = "1.0.109" @@ -1327,34 +1317,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tree-sitter" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75" -dependencies = [ - "cc", - "regex", - "regex-syntax", - "streaming-iterator", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-language" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0d1bf6fdd806e43ae5198f82f527056d359def39e54e67a0f478ac09dac081" - -[[package]] -name = "tree-sitter-r" -version = "1.1.0" -source = "git+https://github.com/r-lib/tree-sitter-r?rev=daa26a2ff0d9546e9125c7d8bcec046027f02070#daa26a2ff0d9546e9125c7d8bcec046027f02070" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "typeid" version = "1.0.3"