Upgrade tree-sitter dependencies

Author: djc

Cargo.lock

@@ -25,6 +25,6 @@ serde_json = "1"
 # TODO(@cpu): handle breaking API changes for tree-sitter 0.24.
 #   This is blocked on a tree-sitter-md release for the tree-sitter 0.24 update
 #   presently unreleased on upstream main.
-tree-sitter = "0.23"
-tree-sitter-c = "0.23"
-tree-sitter-md = "0.3"
+tree-sitter = "0.26"
+tree-sitter-c = "0.24"
+tree-sitter-md = "0.5"

Cargo.toml

@@ -4,7 +4,7 @@ use std::fmt::{Display, Formatter};
 use std::fs;
 
 use serde::Serialize;
-use tree_sitter::{Node, Parser, Query, QueryCursor};
+use tree_sitter::{Node, Parser, Query, QueryCursor, StreamingIterator};
 use tree_sitter_md::MarkdownParser;
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -122,11 +122,16 @@ fn find_doc_items(root: Node, source_code: &[u8]) -> Result<ApiDocs, Box<dyn Err
     let query = Query::new(&language.into(), query)?;
 
     let mut cursor = QueryCursor::new();
-    let matches = cursor.matches(&query, root, source_code);
+    let mut matches = cursor.matches(&query, root, source_code);
 
     let mut items = Vec::default();
     let mut errors = 0;
-    for query_match in matches {
+    loop {
+        matches.advance();
+        let Some(query_match) = matches.get() else {
+            break;
+        };
+
         for doc_item_node in query_match.nodes_for_capture_index(0) {
             match process_doc_item(doc_item_node, source_code) {
                 Ok(Some(item)) => items.push(item),

tools/src/bin/docgen/main.rs

@@ -4,7 +4,7 @@ use std::io::Read;
 use std::path::PathBuf;
 
 use toml::Table;
-use tree_sitter::{Parser, Query, QueryCursor};
+use tree_sitter::{Parser, Query, QueryCursor, StreamingIterator};
 
 /// Ensure that the correct version part defines are in src/rustls.h
 ///
@@ -61,9 +61,14 @@ fn version_in_header() -> String {
         )"#;
     let query = Query::new(&language.into(), query).unwrap();
     let mut cursor = QueryCursor::new();
-    let matches = cursor.matches(&query, tree.root_node(), header_file_bytes);
+    let mut matches = cursor.matches(&query, tree.root_node(), header_file_bytes);
     let mut version_parts: [&str; 3] = Default::default();
-    for query_match in matches {
+    loop {
+        matches.advance();
+        let Some(query_match) = matches.get() else {
+            break;
+        };
+
         for preproc in query_match.nodes_for_capture_index(0) {
             let Some(value_node) = preproc.parent().unwrap().child_by_field_name("value") else {
                 continue;