Merge pull request #16451 from hvitved/treesitter/codeql-verbosity

Tree-sitter: Respect verbosity defined in `CODEQL_VERBOSITY`
github · May 24, 2024 · 0dbce3d · 0dbce3d
2 parents 8ae607c + e4cd9d8
commit 0dbce3d
Show file tree

Hide file tree

Showing 13 changed files with 2,385 additions and 5,017 deletions.
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
diff --git a/ql/extractor/src/extractor.rs b/ql/extractor/src/extractor.rs
@@ -20,12 +20,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    tracing_subscriber::fmt()
-        .with_target(false)
-        .without_time()
-        .with_level(true)
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .init();
+    codeql_extractor::extractor::set_tracing_level("ql");
 
     let extractor = simple::Extractor {
         prefix: "ql".to_string(),

diff --git a/ql/extractor/src/generator.rs b/ql/extractor/src/generator.rs
@@ -15,12 +15,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    tracing_subscriber::fmt()
-        .with_target(false)
-        .without_time()
-        .with_level(true)
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .init();
+    codeql_extractor::extractor::set_tracing_level("ql");
 
     let languages = vec![
         Language {

diff --git a/ql/rust-toolchain.toml b/ql/rust-toolchain.toml
@@ -2,6 +2,6 @@
 # extractor. It is set to the lowest version of Rust we want to support.
 
 [toolchain]
-channel = "1.70"
+channel = "1.74"
 profile = "minimal"
 components = [ "rustfmt" ]