From b8fcf276615c4a979067161b89e1c014e451dae2 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Tue, 10 Feb 2026 02:20:53 -0500 Subject: [PATCH] build(rust): update deps --- Cargo.lock | Bin 77312 -> 76120 bytes Cargo.toml | 30 +++++++++--------- crates/cli/src/fuzz.rs | 6 ++-- crates/cli/src/fuzz/random.rs | 7 ++-- crates/cli/src/init.rs | 2 +- crates/cli/src/main.rs | 4 +-- crates/cli/src/tests/helpers/query_helpers.rs | 22 ++++++------- crates/cli/src/wasm.rs | 19 ++++++----- crates/generate/Cargo.toml | 2 +- crates/xtask/Cargo.toml | 2 +- lib/binding_rust/bindings.rs | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81bf584192916777d2fb7762fe628ea8101b1218..4229c5592bce3b97af2f8983160f25e4e158628e 100644 GIT binary patch delta 1313 zcmZ9MO=w+36o7eYOq(BLi{&M@P+lII1hHk#{EyJQhzN;hVbZ$MMVy~A8f^38OCl1% zA1F#iH<{XYq0qQ+BL&Mvic}XaT!2qLRMTZ=XtBj8E(P`0am~3w3C?JtgLlTe z99>{c8iOv&kPLuuN?Q|EW=6<>vHbo{z5F=wX!&&Ck?N7=Cw)WzJ8H*-nZUiIzeLtL zgAUAc5rT2d$)u#GKp_d~19vBf}z2)oqvF)j$GBSB*b@0Bg zM$7U`OD)MIG7y#_{|B!f&~Jkdb|Dq8Lo@ML5b3D5!tDTG#$BU6qQ|3`g1ZnQf` z*E;QZ^t6wicJqOuMl;d7^3C+&Be(4hy?~wdmG)}mc%#XVvF(=^TZ${qe9Fve0;z0t z-XH>XCdJ^C2kp2CU?OmnnU9PojYeC~kgE_243AfrWxZA!b4#;aWneNW1|f5yB^sMp z63)mNqM<5`uvuBH1k;#+TLffOopX_LaJqaxSufA&2M4yW(_YysSN0#SzSr0K_H^rM zZTgmEGBJ)wU9jHrn3FYvF&%>ek*W2hkdB5V;!#NHm_i_=0m!B#dd(Q@!s!9KaOqI3 z(YUqzkKb*Kjum+8@!716jahofdF0d=Ehukv3IpWKtapmifh5U3t73M^0}{5Z1*4@` zcnwXBv5Nj__{(Ta0sBRaG;fEP3xo&uA|$&ytVg)uQE5h)IxCIM5| z*n!UG`o_wO<)K}u2Ige+VtS&CBPn6^Dov7|@-``(47Y|jd>wn!* zGi73KX@-$!4vgytjLr$p1+_^g&5Uzo8`lY$FtlN<;Z|w@YIpW5h0tX`Pr5l}!jn1~X~m~+{AyI!Xo zqjzca{Cx&Dy0x@V)2z?-j$n~e%t;#>JcXntVj{=rp(PC>-4&Ukvow*Z%Rf-)z%;~Q zbFe;?#^`uiIJd7_Ex(SGH(ozkzS}uV@b2zTeOcS-uikzC&x7~$4sWkUT#k6^RBv^Q zbMMn?_v+;XHCdhi^271%8%yQmo9D{Z&B+RX{-Ccq@XN`;J@ivq+pSk;e*1f*dj6j{ Rb>Y%p|$`3 delta 1699 zcmZvcO=w(I6vugKOq&>Eig7x%R;CGU5zKJEKMd_m79vz@GI3=QT(saq)Qv8rN(58rLdE#CP-+#=ONoLAZ!z!9<^Iq4|9|IP z`Mm$kYX7@(#~Z9Zv_&>)UVCh|MWhJ9OHWC%i3Oh|jh;&x90ei+1Ey_=)DWSJ0RmnN zFEr;)y66(*m-pB5m*a=>ckB0*(-ZIa<#uy0e>{0x`QyG%MhcdpAk1GiBKr3AConChsKB-2JMuYNVO{K&3iAYXcQM|nioiaZnM z+DaN9q9GErCP@(OgJP7h6r2t$C=p^zEcxJ>Hy)_Pc9aYe#jGI^b7!HJ>-PTq;-^FT zNcYxq&aU>AR}P#V$%|&L6_^d2C?f?=L9xLn2y#7MTLVry|`!iSl5S}a;}%# z#jd<<=Iip;nfX0i1ZLlvnr#77K{D{b8HA7+P!e3wn#p9Mi;`K)TqZ9y;htf18WoAg zjDjKB<+Z)_@`0z%^$#>?lQwytF77ISKXLt*ygoM9;#%Uxj&g%d_!Lv(!jLGOVjPk{ z(!7*jTS$uPK#({vlz8kwB^0T^D$hN4WMpvhlF$~CRa5i7qa_6>ZnYPqo?otyAge@$IHzrEn)w;#PzFL>^ZblORQK^_S8 zL^2ZtrwWpfQddo5A&5WX$1QS1w9-TYBgCSuRud{MJ5G13Mb Option { #[must_use] pub fn new_seed() -> usize { int_env_var("TREE_SITTER_SEED").unwrap_or_else(|| { - let mut rng = rand::thread_rng(); - let seed = rng.r#gen::(); + let mut rng = rand::rng(); + let seed = rng.random_range(0..=usize::MAX); info!("Seed: {seed}"); seed }) diff --git a/crates/cli/src/fuzz/random.rs b/crates/cli/src/fuzz/random.rs index 7b2ede62b..ae5d9b64f 100644 --- a/crates/cli/src/fuzz/random.rs +++ b/crates/cli/src/fuzz/random.rs @@ -1,7 +1,4 @@ -use rand::{ - distributions::Alphanumeric, - prelude::{Rng, SeedableRng, StdRng}, -}; +use rand::{RngExt, SeedableRng, distr::Alphanumeric, rngs::StdRng}; const OPERATORS: &[char] = &[ '+', '-', '<', '>', '(', ')', '*', '/', '&', '|', '!', ',', '.', '%', @@ -16,7 +13,7 @@ impl Rand { } pub fn unsigned(&mut self, max: usize) -> usize { - self.0.gen_range(0..=max) + self.0.random_range(0..=max) } pub fn words(&mut self, max_count: usize) -> Vec { diff --git a/crates/cli/src/init.rs b/crates/cli/src/init.rs index 73c8e21d3..0bf80ebaf 100644 --- a/crates/cli/src/init.rs +++ b/crates/cli/src/init.rs @@ -1447,7 +1447,7 @@ fn generate_file( } if filename == "build.zig.zon" { - let id = thread_rng().gen_range(1u32..0xFFFF_FFFFu32); + let id = rand::rng().random_range(1u32..0xFFFF_FFFFu32); let checksum = crc32(format!("tree_sitter_{language_name}").as_bytes()); replacement = replacement.replace( PARSER_FINGERPRINT_PLACEHOLDER, diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 5dd7883f2..898895646 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -806,7 +806,7 @@ impl Init { let enabled = MultiSelect::new() .with_prompt("Bindings") - .items_checked(&languages) + .items_checked(languages.iter().copied()) .interact()? .into_iter() .map(|i| languages[i].0); @@ -880,7 +880,7 @@ impl Init { let idx = FuzzySelect::with_theme(&ColorfulTheme::default()) .with_prompt("Which field would you like to change?") - .items(&choices) + .items(choices) .interact()?; set_choice!(choices[idx]); diff --git a/crates/cli/src/tests/helpers/query_helpers.rs b/crates/cli/src/tests/helpers/query_helpers.rs index f1a0f24b6..44ee14727 100644 --- a/crates/cli/src/tests/helpers/query_helpers.rs +++ b/crates/cli/src/tests/helpers/query_helpers.rs @@ -1,6 +1,6 @@ use std::{cmp::Ordering, fmt::Write, ops::Range}; -use rand::prelude::Rng; +use rand::{Rng, RngExt}; use streaming_iterator::{IntoStreamingIterator, StreamingIterator}; use tree_sitter::{ Language, Node, Parser, Point, Query, QueryCapture, QueryCursor, QueryMatch, Tree, TreeCursor, @@ -31,11 +31,11 @@ impl Pattern { // Descend to the node at a random byte offset and depth. let mut max_depth = 0; - let byte_offset = rng.gen_range(0..cursor.node().end_byte()); + let byte_offset = rng.random_range(0..cursor.node().end_byte()); while cursor.goto_first_child_for_byte(byte_offset).is_some() { max_depth += 1; } - let depth = rng.gen_range(0..=max_depth); + let depth = rng.random_range(0..=max_depth); for _ in 0..depth { cursor.goto_parent(); } @@ -45,7 +45,7 @@ impl Pattern { let pattern_start = cursor.node().start_position(); let mut roots = vec![Self::random_pattern_for_node(&mut cursor, rng)]; while roots.len() < 5 && cursor.goto_next_sibling() { - if rng.gen_bool(0.2) { + if rng.random_bool(0.2) { roots.push(Self::random_pattern_for_node(&mut cursor, rng)); } } @@ -79,22 +79,22 @@ impl Pattern { let node = cursor.node(); // Sometimes specify the node's type, sometimes use a wildcard. - let (kind, named) = if rng.gen_bool(0.9) { + let (kind, named) = if rng.random_bool(0.9) { (Some(node.kind()), node.is_named()) } else { - (Some("_"), node.is_named() && rng.gen_bool(0.8)) + (Some("_"), node.is_named() && rng.random_bool(0.8)) }; // Sometimes specify the node's field. - let field = if rng.gen_bool(0.75) { + let field = if rng.random_bool(0.75) { cursor.field_name() } else { None }; // Sometimes capture the node. - let capture = if rng.gen_bool(0.7) { - Some(CAPTURE_NAMES[rng.gen_range(0..CAPTURE_NAMES.len())].to_string()) + let capture = if rng.random_bool(0.7) { + Some(CAPTURE_NAMES[rng.random_range(0..CAPTURE_NAMES.len())].to_string()) } else { None }; @@ -102,9 +102,9 @@ impl Pattern { // Walk the children and include child patterns for some of them. let mut children = Vec::new(); if named && cursor.goto_first_child() { - let max_children = rng.gen_range(0..4); + let max_children = rng.random_range(0..4); while cursor.goto_next_sibling() { - if rng.gen_bool(0.6) { + if rng.random_bool(0.6) { let child_ast = Self::random_pattern_for_node(cursor, rng); children.push(child_ast); if children.len() >= max_children { diff --git a/crates/cli/src/wasm.rs b/crates/cli/src/wasm.rs index 1f47e598e..002cb034e 100644 --- a/crates/cli/src/wasm.rs +++ b/crates/cli/src/wasm.rs @@ -83,14 +83,17 @@ pub fn compile_language_to_wasm( let wasm_bytes = fs::read(&output_filename)?; let parser = Parser::new(0); for payload in parser.parse_all(&wasm_bytes) { - if let wasmparser::Payload::ImportSection(imports) = payload? { - for import in imports { - let import = import?.name; - if !builtin_symbols.contains(&import) - && !stdlib_symbols.contains(&import) - && !dylink_symbols.contains(&import) - { - missing_symbols.push(import); + if let wasmparser::Payload::ImportSection(reader) = payload? { + for imports in reader { + for import in imports? { + let (_, import) = import?; + let name = import.name; + if !builtin_symbols.contains(&name) + && !stdlib_symbols.contains(&name) + && !dylink_symbols.contains(&name) + { + missing_symbols.push(name); + } } } } diff --git a/crates/generate/Cargo.toml b/crates/generate/Cargo.toml index 749be82f2..ca77b704b 100644 --- a/crates/generate/Cargo.toml +++ b/crates/generate/Cargo.toml @@ -25,7 +25,7 @@ load = [ "dep:semver" ] qjs-rt = [ "load", "rquickjs", "pathdiff" ] [dependencies] -bitflags = "2.9.4" +bitflags = "2.10.0" dunce = "1.0.5" indexmap.workspace = true indoc.workspace = true diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml index 334d30b83..e28a8c6fd 100644 --- a/crates/xtask/Cargo.toml +++ b/crates/xtask/Cargo.toml @@ -22,7 +22,7 @@ clap.workspace = true etcetera.workspace = true indoc.workspace = true notify = "8.2.0" -notify-debouncer-full = "0.6.0" +notify-debouncer-full = "0.7.0" regex.workspace = true schemars.workspace = true semver.workspace = true diff --git a/lib/binding_rust/bindings.rs b/lib/binding_rust/bindings.rs index 4b2718914..bc47b782c 100644 --- a/lib/binding_rust/bindings.rs +++ b/lib/binding_rust/bindings.rs @@ -731,7 +731,7 @@ unsafe extern "C" { unsafe extern "C" { #[doc = " Advance to the next match of the currently running query.\n\n If there is a match, write it to `*match` and return `true`.\n Otherwise, return `false`."] pub fn ts_query_cursor_next_match(self_: *mut TSQueryCursor, match_: *mut TSQueryMatch) - -> bool; + -> bool; } unsafe extern "C" { pub fn ts_query_cursor_remove_match(self_: *mut TSQueryCursor, match_id: u32);