Merge pull request #17408 from github/aibaars/rust-experiment

Rust: add partial extractor for Expr, Statement, Pattern

Author: redsun82

rust/codeql-extractor.yml

@@ -13,4 +13,24 @@ file_types:
   - name: rust
     display_name: Rust files
     extensions:
-       - .rs
+      - .rs
+options:
+  trap:
+    title: Options pertaining to TRAP.
+    type: object
+    properties:
+      compression:
+        title: Controls compression for the TRAP files written by the extractor.
+        description: >
+          This option is only intended for use in debugging the extractor. Accepted
+          values are 'brotli' (the default, to write brotli-compressed TRAP), 'gzip', and 'none'
+          (to write uncompressed TRAP).
+        type: string
+        pattern: "^(none|gzip|brotli)$"
+  extract_dependencies:
+    title: Whether to extract dependencies.
+    description: >
+      Extract the source code of dependencies and the standard libraries in addition to 
+      normal source code.
+    type: string
+    pattern: "^(false|true)$"

rust/extractor/Cargo.lock

@@ -16,6 +16,7 @@ ra_ap_hir = "0.0.232"
 ra_ap_hir_def = "0.0.232"
 ra_ap_ide_db = "0.0.232"
 ra_ap_load-cargo = "0.0.232"
+ra_ap_paths = "0.0.232"
 ra_ap_project_model = "0.0.232"
 ra_ap_syntax = "0.0.232"
 ra_ap_vfs = "0.0.232"

rust/extractor/Cargo.toml

@@ -32,6 +32,7 @@ pub struct Config {
     pub scratch_dir: PathBuf,
     pub trap_dir: PathBuf,
     pub source_archive_dir: PathBuf,
+    pub extract_dependencies: bool,
     pub verbose: u8,
     pub compression: Compression,
     pub inputs: Vec<PathBuf>,
@@ -68,10 +69,11 @@ impl Config {
             let inputs_list = std::fs::read_to_string(inputs_file).context("reading file list")?;
             cli_args
                 .inputs
-                .extend(inputs_list.split("\n").map(PathBuf::from));
+                .extend(inputs_list.split_terminator("\n").map(PathBuf::from));
         }
         Figment::new()
             .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_"))
+            .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_OPTION_"))
             .merge(Serialized::defaults(cli_args))
             .extract()
             .context("loading configuration")