hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 09:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Python: upgrade cargo dependencies

Browse Source 
This required some code changes because of some breaking changes in
`clap` and `tree-sitter`.

Also needed to assign a new bazel repo name to the `crates_vendor` to
avoid name conflicts in `MODULE.bazel`.
This commit is contained in:
Paolo Tranquilli
2025-02-17 10:40:00 +01:00
parent 3644de007f
commit 91b3d108bb
71 changed files with 3293 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
python/extractor/tsg-python/src/main.rs
View File

@@ -10,8 +10,6 @@ use std::path::Path;
use anyhow::anyhow;
use anyhow::Context as _;
use anyhow::Result;
use clap::App;
use clap::Arg;
use tree_sitter::Parser;
use tree_sitter_graph::ast::File;
use tree_sitter_graph::functions::Functions;
@@ -482,33 +480,26 @@ pub mod extra_functions {
}
fn main() -> Result<()> {
let matches = App::new("tsg-python")
let matches = clap::Command::new("tsg-python")
.version(BUILD_VERSION)
.author("Taus Brock-Nannestad <tausbn@github.com>")
.about("Extracts a Python AST from the parse tree given by tree-sitter-python")
.arg(
Arg::with_name("tsg")
.short("t")
.long("tsg")
.takes_value(true)
.required(false),
)
.arg(Arg::with_name("source").index(1).required(true))
.args(&[
clap::arg!("-t --tsg [TSG]"),
clap::arg!("--source <SOURCE>"),
])
.get_matches();
let tsg_path = if matches.is_present("tsg") {
Path::new(matches.value_of("tsg").unwrap())
.display()
.to_string()
} else {
"bundled `python.tsg`".to_owned()
};
let source_path = Path::new(matches.value_of("source").unwrap());
let tsg_path = matches
.get_one::<String>("tsg")
.map(|s| Path::new(s).display().to_string())
.unwrap_or_else(|| "bundled `python.tsg`".to_owned());
let source_path = Path::new(matches.get_one::<String>("source").unwrap());
let language = tsp::language();
let mut parser = Parser::new();
parser.set_language(language)?;
parser.set_language(&language)?;
// Statically include `python.tsg`:
let tsg = if matches.is_present("tsg") {
let tsg = if matches.contains_id("tsg") {
std::fs::read(&tsg_path).with_context(|| format!("Error reading TSG file {}", tsg_path))?
} else {
include_bytes!("../python.tsg").to_vec()