From be45e3deeded77e645c872323ba8083d769e9048 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 8 Nov 2024 12:21:25 +0100
Subject: [PATCH 1/8] Rust: allow to specify more cargo configuration options

This allows to tweak via extractor options some aspects of the cargo
configuration:
* the target architecture
* features (including `*` for all, which we must understand whether to
  set by default)
* cfg overrides

Integration tests will be added in a follow-up commit.
---
 Cargo.lock                          |  2 +
 rust/codeql-extractor.yml           | 19 +++++++
 rust/extractor/Cargo.toml           |  2 +
 rust/extractor/macros/src/lib.rs    | 62 ++++++++++++++-------
 rust/extractor/src/config.rs        | 86 ++++++++++++++++++++++++++++-
 rust/extractor/src/main.rs          |  6 +-
 rust/extractor/src/rust_analyzer.rs | 11 +---
 7 files changed, 155 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9304acd6d2e..97bc7d1c761 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -389,10 +389,12 @@ dependencies = [
  "log",
  "num-traits",
  "ra_ap_base_db",
+ "ra_ap_cfg",
  "ra_ap_hir",
  "ra_ap_hir_def",
  "ra_ap_hir_expand",
  "ra_ap_ide_db",
+ "ra_ap_intern",
  "ra_ap_load-cargo",
  "ra_ap_parser",
  "ra_ap_paths",
diff --git a/rust/codeql-extractor.yml b/rust/codeql-extractor.yml
index c7558c17efe..2f726a10ada 100644
--- a/rust/codeql-extractor.yml
+++ b/rust/codeql-extractor.yml
@@ -35,3 +35,22 @@ options:
       reduce execution time of consecutive extractor runs. By default, a new scratch
       directory is used for each run.
     type: string
+  cargo_target:
+    title: Target architecture
+    description: >
+      Target architecture to use for analysis, analogous to `cargo --target`. By
+      default the host architecture is used.
+    type: string
+  cargo_features:
+    title: Cargo features to turn on
+    description: >
+      Comma-separated list of features to turn on. If any value is `*` all features
+      are turned on. By default only default cargo features are enabled. Can be
+      repeated.
+    type: array
+  cargo_cfg_overrides:
+    title: Cargo cfg overrides
+    description: >
+      Comma-separated list of cfg settings to enable, or disable if prefixed with `-`.
+      Can be repeated.
+    type: array
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 2cb4e70fc7d..5b7e09e6f3f 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -21,6 +21,8 @@ ra_ap_syntax = "0.0.232"
 ra_ap_vfs = "0.0.232"
 ra_ap_parser = "0.0.232"
 ra_ap_span = "0.0.232"
+ra_ap_cfg = "0.0.232"
+ra_ap_intern = "0.0.232"
 serde = "1.0.209"
 serde_with = "3.9.0"
 stderrlog = "0.6.0"
diff --git a/rust/extractor/macros/src/lib.rs b/rust/extractor/macros/src/lib.rs
index c9771a181de..c10747bef01 100644
--- a/rust/extractor/macros/src/lib.rs
+++ b/rust/extractor/macros/src/lib.rs
@@ -1,11 +1,34 @@
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
+use syn::{Ident, Type};
+
+fn get_type_tip(t: &Type) -> Option<&Ident> {
+    let syn::Type::Path(path) = t else {
+        return None;
+    };
+    let segment = path.path.segments.last()?;
+    Some(&segment.ident)
+}
 
 /// Allow all fields in the extractor config to be also overrideable by extractor CLI flags
 #[proc_macro_attribute]
 pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let ast = syn::parse_macro_input!(item as syn::ItemStruct);
     let name = &ast.ident;
+    let fields = ast
+        .fields
+        .iter()
+        .map(|f| {
+            if get_type_tip(&f.ty).is_some_and(|i| i == "Vec") {
+                quote! {
+                    #[serde(deserialize_with="deserialize_newline_or_comma_separated")]
+                    #f
+                }
+            } else {
+                quote! { #f }
+            }
+        })
+        .collect::<Vec<_>>();
     let cli_name = format_ident!("Cli{}", name);
     let cli_fields = ast
         .fields
@@ -13,35 +36,34 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         .map(|f| {
             let id = f.ident.as_ref().unwrap();
             let ty = &f.ty;
-            if let syn::Type::Path(p) = ty {
-                if p.path.is_ident(&format_ident!("bool")) {
-                    return quote! {
-                        #[arg(long)]
-                        #[serde(skip_serializing_if="<&bool>::not")]
-                        #id: bool,
-                    };
-                }
-                if p.path.segments.len() == 1 && p.path.segments[0].ident == "Option" {
-                    return quote! {
-                        #[arg(long)]
-                        #id: #ty,
-                    };
-                }
+            let type_tip = get_type_tip(ty);
+            if type_tip.is_some_and(|i| i == "bool") {
+                return quote! {
+                    #[arg(long)]
+                    #[serde(skip_serializing_if="<&bool>::not")]
+                    #id: bool
+                };
+            }
+            if type_tip.is_some_and(|i| i == "Option") {
+                return quote! {
+                    #[arg(long)]
+                    #f
+                };
             }
             if id == &format_ident!("verbose") {
                 quote! {
                     #[arg(long, short, action=clap::ArgAction::Count)]
                     #[serde(skip_serializing_if="u8::is_zero")]
-                    #id: u8,
+                    #id: u8
                 }
             } else if id == &format_ident!("inputs") {
                 quote! {
-                    #id: #ty,
+                    #f
                 }
             } else {
                 quote! {
                     #[arg(long)]
-                    #id: Option<#ty>,
+                    #id: Option<#ty>
                 }
             }
         })
@@ -66,7 +88,9 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
     let gen = quote! {
         #[serde_with::apply(_ => #[serde(default)])]
         #[derive(Deserialize, Default)]
-        #ast
+        pub struct #name {
+            #(#fields),*
+        }
 
         impl Debug for #name {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -80,7 +104,7 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         #[derive(clap::Parser, Serialize)]
         #[command(about, long_about = None)]
         struct #cli_name {
-            #(#cli_fields)*
+            #(#cli_fields),*
         }
     };
     gen.into()
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index f477663f607..5e17a458db7 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -7,9 +7,14 @@ use figment::{
     Figment,
 };
 use itertools::Itertools;
+use log::warn;
 use num_traits::Zero;
+use ra_ap_cfg::{CfgAtom, CfgDiff};
+use ra_ap_intern::Symbol;
+use ra_ap_paths::Utf8PathBuf;
+use ra_ap_project_model::{CargoConfig, CargoFeatures, CfgOverrides, RustLibSource};
 use rust_extractor_macros::extractor_cli_config;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 use std::fmt::Debug;
 use std::ops::Not;
 use std::path::PathBuf;
@@ -32,12 +37,23 @@ impl From<Compression> for trap::Compression {
     }
 }
 
+// required by the extractor_cli_config macro.
+fn deserialize_newline_or_comma_separated<'a, D: Deserializer<'a>, T: for<'b> From<&'b str>>(
+    deserializer: D,
+) -> Result<Vec<T>, D::Error> {
+    let value = String::deserialize(deserializer)?;
+    Ok(value.split(['\n', ',']).map(T::from).collect())
+}
+
 #[extractor_cli_config]
 pub struct Config {
     pub scratch_dir: PathBuf,
     pub trap_dir: PathBuf,
     pub source_archive_dir: PathBuf,
     pub cargo_target_dir: Option<PathBuf>,
+    pub cargo_target: Option<String>,
+    pub cargo_features: Vec<String>,
+    pub cargo_cfg_overrides: Vec<String>,
     pub verbose: u8,
     pub compression: Compression,
     pub inputs: Vec<PathBuf>,
@@ -51,7 +67,7 @@ impl Config {
             .context("expanding parameter files")?;
         let cli_args = CliConfig::parse_from(args);
         let mut figment = Figment::new()
-            .merge(Env::prefixed("CODEQL_"))
+            .merge(Env::raw().only(["CODEQL_VERBOSE"].as_slice()))
             .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_"))
             .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_OPTION_"))
             .merge(Serialized::defaults(cli_args));
@@ -71,4 +87,70 @@ impl Config {
         }
         figment.extract().context("loading configuration")
     }
+
+    pub fn to_cargo_config(&self) -> CargoConfig {
+        let sysroot = Some(RustLibSource::Discover);
+
+        let target_dir = self
+            .cargo_target_dir
+            .clone()
+            .unwrap_or_else(|| self.scratch_dir.join("target"));
+        let target_dir = Utf8PathBuf::from_path_buf(target_dir).ok();
+
+        let features = if self.cargo_features.is_empty() {
+            Default::default()
+        } else if self.cargo_features.contains(&"*".to_string()) {
+            CargoFeatures::All
+        } else {
+            CargoFeatures::Selected {
+                features: self.cargo_features.clone(),
+                no_default_features: false,
+            }
+        };
+
+        let target = self.cargo_target.clone();
+
+        let cfg_overrides = to_cfg_overrides(&self.cargo_cfg_overrides);
+
+        CargoConfig {
+            sysroot,
+            target_dir,
+            features,
+            target,
+            cfg_overrides,
+            ..Default::default()
+        }
+    }
+}
+
+fn to_cfg_override(spec: &str) -> CfgAtom {
+    if let Some((key, value)) = spec.split_once("=") {
+        CfgAtom::KeyValue {
+            key: Symbol::intern(key),
+            value: Symbol::intern(value),
+        }
+    } else {
+        CfgAtom::Flag(Symbol::intern(spec))
+    }
+}
+
+fn to_cfg_overrides(specs: &Vec<String>) -> CfgOverrides {
+    let mut enabled_cfgs = Vec::new();
+    let mut disabled_cfgs = Vec::new();
+    for spec in specs {
+        if spec.starts_with("-") {
+            disabled_cfgs.push(to_cfg_override(&spec[1..]));
+        } else {
+            enabled_cfgs.push(to_cfg_override(spec));
+        }
+    }
+    if let Some(global) = CfgDiff::new(enabled_cfgs, disabled_cfgs) {
+        CfgOverrides {
+            global,
+            ..Default::default()
+        }
+    } else {
+        warn!("non-disjoint cfg overrides, ignoring: {}", specs.join(", "));
+        CfgOverrides::default()
+    }
 }
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 1f963a0990e..ecbdc965f8e 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -130,11 +130,9 @@ fn main() -> anyhow::Result<()> {
         }
         extractor.extract_without_semantics(file, "no manifest found");
     }
-    let target_dir = &cfg
-        .cargo_target_dir
-        .unwrap_or_else(|| cfg.scratch_dir.join("target"));
+    let cargo_config = cfg.to_cargo_config();
     for (manifest, files) in map.values().filter(|(_, files)| !files.is_empty()) {
-        if let Some((ref db, ref vfs)) = RustAnalyzer::load_workspace(manifest, target_dir) {
+        if let Some((ref db, ref vfs)) = RustAnalyzer::load_workspace(manifest, &cargo_config) {
             let semantics = Semantics::new(db);
             for file in files {
                 let Some(id) = path_to_file_id(file, vfs) else {
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index ddbc16ab6a3..735bacb27c1 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -7,7 +7,6 @@ use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice
 use ra_ap_paths::Utf8PathBuf;
 use ra_ap_project_model::CargoConfig;
 use ra_ap_project_model::ProjectManifest;
-use ra_ap_project_model::RustLibSource;
 use ra_ap_span::Edition;
 use ra_ap_span::EditionedFileId;
 use ra_ap_span::TextRange;
@@ -20,6 +19,7 @@ use ra_ap_vfs::{AbsPathBuf, FileId};
 use std::borrow::Cow;
 use std::path::{Path, PathBuf};
 use triomphe::Arc;
+
 pub enum RustAnalyzer<'a> {
     WithSemantics {
         vfs: &'a Vfs,
@@ -45,13 +45,8 @@ pub struct ParseResult<'a> {
 impl<'a> RustAnalyzer<'a> {
     pub fn load_workspace(
         project: &ProjectManifest,
-        target_dir: &Path,
+        config: &CargoConfig,
     ) -> Option<(RootDatabase, Vfs)> {
-        let config = CargoConfig {
-            sysroot: Some(RustLibSource::Discover),
-            target_dir: ra_ap_paths::Utf8PathBuf::from_path_buf(target_dir.to_path_buf()).ok(),
-            ..Default::default()
-        };
         let progress = |t| (log::trace!("progress: {}", t));
         let load_config = LoadCargoConfig {
             load_out_dirs_from_check: true,
@@ -60,7 +55,7 @@ impl<'a> RustAnalyzer<'a> {
         };
         let manifest = project.manifest_path();
 
-        match load_workspace_at(manifest.as_ref(), &config, &load_config, &progress) {
+        match load_workspace_at(manifest.as_ref(), config, &load_config, &progress) {
             Ok((db, vfs, _macro_server)) => Some((db, vfs)),
             Err(err) => {
                 log::error!("failed to load workspace for {}: {}", manifest, err);

From b9ea78fb32b7b3705084d9bdaaeff5b98f6bb966 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 8 Nov 2024 13:06:15 +0100
Subject: [PATCH 2/8] Rust: fix vector options

---
 rust/extractor/macros/src/lib.rs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/rust/extractor/macros/src/lib.rs b/rust/extractor/macros/src/lib.rs
index c10747bef01..c70856aad9f 100644
--- a/rust/extractor/macros/src/lib.rs
+++ b/rust/extractor/macros/src/lib.rs
@@ -19,7 +19,9 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         .fields
         .iter()
         .map(|f| {
-            if get_type_tip(&f.ty).is_some_and(|i| i == "Vec") {
+            if f.ident.as_ref().is_some_and(|i| i != "inputs")
+                && get_type_tip(&f.ty).is_some_and(|i| i == "Vec")
+            {
                 quote! {
                     #[serde(deserialize_with="deserialize_newline_or_comma_separated")]
                     #f
@@ -38,19 +40,17 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
             let ty = &f.ty;
             let type_tip = get_type_tip(ty);
             if type_tip.is_some_and(|i| i == "bool") {
-                return quote! {
+                quote! {
                     #[arg(long)]
                     #[serde(skip_serializing_if="<&bool>::not")]
                     #id: bool
-                };
-            }
-            if type_tip.is_some_and(|i| i == "Option") {
-                return quote! {
+                }
+            } else if type_tip.is_some_and(|i| i == "Option") {
+                quote! {
                     #[arg(long)]
                     #f
-                };
-            }
-            if id == &format_ident!("verbose") {
+                }
+            } else if id == &format_ident!("verbose") {
                 quote! {
                     #[arg(long, short, action=clap::ArgAction::Count)]
                     #[serde(skip_serializing_if="u8::is_zero")]
@@ -60,6 +60,11 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
                 quote! {
                     #f
                 }
+            } else if type_tip.is_some_and(|i| i == "Vec") {
+                quote! {
+                    #[arg(long)]
+                    #id: Option<String>
+                }
             } else {
                 quote! {
                     #[arg(long)]

From a13c70bd11e9e8b7bf8315251a6856fa11faee38 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 8 Nov 2024 16:50:21 +0100
Subject: [PATCH 3/8] Rust: add integration test for cargo options

---
 rust/ql/integration-tests/options/Cargo.toml  |  9 +++++
 .../options/arch_functions.Darwin.expected    |  1 +
 .../options/arch_functions.Linux.expected     |  1 +
 .../options/arch_functions.Windows.expected   |  1 +
 .../options/arch_functions.ql                 |  5 +++
 .../options/cfg_functions.expected            |  2 +
 .../options/cfg_functions.override.expected   |  3 ++
 .../options/cfg_functions.ql                  |  5 +++
 .../options/feature_functions.all.expected    |  3 ++
 .../options/feature_functions.bar.expected    |  2 +
 .../options/feature_functions.expected        |  1 +
 .../options/feature_functions.foo.expected    |  2 +
 .../options/feature_functions.ql              |  5 +++
 rust/ql/integration-tests/options/src/arch.rs |  8 ++++
 rust/ql/integration-tests/options/src/cfg.rs  | 14 +++++++
 .../integration-tests/options/src/features.rs |  7 ++++
 rust/ql/integration-tests/options/src/lib.rs  |  3 ++
 .../integration-tests/options/test_options.py | 37 +++++++++++++++++++
 18 files changed, 109 insertions(+)
 create mode 100644 rust/ql/integration-tests/options/Cargo.toml
 create mode 100644 rust/ql/integration-tests/options/arch_functions.Darwin.expected
 create mode 100644 rust/ql/integration-tests/options/arch_functions.Linux.expected
 create mode 100644 rust/ql/integration-tests/options/arch_functions.Windows.expected
 create mode 100644 rust/ql/integration-tests/options/arch_functions.ql
 create mode 100644 rust/ql/integration-tests/options/cfg_functions.expected
 create mode 100644 rust/ql/integration-tests/options/cfg_functions.override.expected
 create mode 100644 rust/ql/integration-tests/options/cfg_functions.ql
 create mode 100644 rust/ql/integration-tests/options/feature_functions.all.expected
 create mode 100644 rust/ql/integration-tests/options/feature_functions.bar.expected
 create mode 100644 rust/ql/integration-tests/options/feature_functions.expected
 create mode 100644 rust/ql/integration-tests/options/feature_functions.foo.expected
 create mode 100644 rust/ql/integration-tests/options/feature_functions.ql
 create mode 100644 rust/ql/integration-tests/options/src/arch.rs
 create mode 100644 rust/ql/integration-tests/options/src/cfg.rs
 create mode 100644 rust/ql/integration-tests/options/src/features.rs
 create mode 100644 rust/ql/integration-tests/options/src/lib.rs
 create mode 100644 rust/ql/integration-tests/options/test_options.py

diff --git a/rust/ql/integration-tests/options/Cargo.toml b/rust/ql/integration-tests/options/Cargo.toml
new file mode 100644
index 00000000000..c75338009fe
--- /dev/null
+++ b/rust/ql/integration-tests/options/Cargo.toml
@@ -0,0 +1,9 @@
+[workspace]
+[package]
+name = "options"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+foo = []
+bar = []
diff --git a/rust/ql/integration-tests/options/arch_functions.Darwin.expected b/rust/ql/integration-tests/options/arch_functions.Darwin.expected
new file mode 100644
index 00000000000..64505ef2aaf
--- /dev/null
+++ b/rust/ql/integration-tests/options/arch_functions.Darwin.expected
@@ -0,0 +1 @@
+| src/arch.rs:7:1:8:13 | macos |
diff --git a/rust/ql/integration-tests/options/arch_functions.Linux.expected b/rust/ql/integration-tests/options/arch_functions.Linux.expected
new file mode 100644
index 00000000000..ed290cbad69
--- /dev/null
+++ b/rust/ql/integration-tests/options/arch_functions.Linux.expected
@@ -0,0 +1 @@
+| src/arch.rs:1:1:2:13 | linux |
diff --git a/rust/ql/integration-tests/options/arch_functions.Windows.expected b/rust/ql/integration-tests/options/arch_functions.Windows.expected
new file mode 100644
index 00000000000..bb0067e8a2a
--- /dev/null
+++ b/rust/ql/integration-tests/options/arch_functions.Windows.expected
@@ -0,0 +1 @@
+| src/arch.rs:4:1:5:15 | windows |
diff --git a/rust/ql/integration-tests/options/arch_functions.ql b/rust/ql/integration-tests/options/arch_functions.ql
new file mode 100644
index 00000000000..2bb3182e6e7
--- /dev/null
+++ b/rust/ql/integration-tests/options/arch_functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.getLocation().getFile().getBaseName() = "arch.rs" and f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/cfg_functions.expected b/rust/ql/integration-tests/options/cfg_functions.expected
new file mode 100644
index 00000000000..521e16ac1dd
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg_functions.expected
@@ -0,0 +1,2 @@
+| src/cfg.rs:7:1:8:19 | cfg_no_flag |
+| src/cfg.rs:10:1:11:18 | cfg_no_key |
diff --git a/rust/ql/integration-tests/options/cfg_functions.override.expected b/rust/ql/integration-tests/options/cfg_functions.override.expected
new file mode 100644
index 00000000000..53fa4d12719
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg_functions.override.expected
@@ -0,0 +1,3 @@
+| src/cfg.rs:1:1:2:16 | cfg_flag |
+| src/cfg.rs:4:1:5:15 | cfg_key |
+| src/cfg.rs:13:1:14:15 | no_test |
diff --git a/rust/ql/integration-tests/options/cfg_functions.ql b/rust/ql/integration-tests/options/cfg_functions.ql
new file mode 100644
index 00000000000..6ba57e61a9d
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg_functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.getLocation().getFile().getBaseName() = "cfg.rs" and f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/feature_functions.all.expected b/rust/ql/integration-tests/options/feature_functions.all.expected
new file mode 100644
index 00000000000..dcf10884778
--- /dev/null
+++ b/rust/ql/integration-tests/options/feature_functions.all.expected
@@ -0,0 +1,3 @@
+| src/features.rs:1:1:2:11 | foo |
+| src/features.rs:4:1:5:11 | bar |
+| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.bar.expected b/rust/ql/integration-tests/options/feature_functions.bar.expected
new file mode 100644
index 00000000000..1e7a67b1c16
--- /dev/null
+++ b/rust/ql/integration-tests/options/feature_functions.bar.expected
@@ -0,0 +1,2 @@
+| src/features.rs:4:1:5:11 | bar |
+| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.expected b/rust/ql/integration-tests/options/feature_functions.expected
new file mode 100644
index 00000000000..12ef01e541a
--- /dev/null
+++ b/rust/ql/integration-tests/options/feature_functions.expected
@@ -0,0 +1 @@
+| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.foo.expected b/rust/ql/integration-tests/options/feature_functions.foo.expected
new file mode 100644
index 00000000000..6a4b294edd1
--- /dev/null
+++ b/rust/ql/integration-tests/options/feature_functions.foo.expected
@@ -0,0 +1,2 @@
+| src/features.rs:1:1:2:11 | foo |
+| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.ql b/rust/ql/integration-tests/options/feature_functions.ql
new file mode 100644
index 00000000000..547e3ab9713
--- /dev/null
+++ b/rust/ql/integration-tests/options/feature_functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.getLocation().getFile().getBaseName() = "features.rs" and f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/src/arch.rs b/rust/ql/integration-tests/options/src/arch.rs
new file mode 100644
index 00000000000..fc9ebcbb616
--- /dev/null
+++ b/rust/ql/integration-tests/options/src/arch.rs
@@ -0,0 +1,8 @@
+#[cfg(target_os = "linux")]
+fn linux() {}
+
+#[cfg(target_os = "windows")]
+fn windows() {}
+
+#[cfg(target_os = "macos")]
+fn macos() {}
diff --git a/rust/ql/integration-tests/options/src/cfg.rs b/rust/ql/integration-tests/options/src/cfg.rs
new file mode 100644
index 00000000000..e88250b6cd8
--- /dev/null
+++ b/rust/ql/integration-tests/options/src/cfg.rs
@@ -0,0 +1,14 @@
+#[cfg(cfg_flag)]
+fn cfg_flag() {}
+
+#[cfg(cfg_key = "value")]
+fn cfg_key() {}
+
+#[cfg(not(cfg_flag))]
+fn cfg_no_flag() {}
+
+#[cfg(not(cfg_key = "value"))]
+fn cfg_no_key() {}
+
+#[cfg(not(test))]
+fn no_test() {}
diff --git a/rust/ql/integration-tests/options/src/features.rs b/rust/ql/integration-tests/options/src/features.rs
new file mode 100644
index 00000000000..c1e97e05fd7
--- /dev/null
+++ b/rust/ql/integration-tests/options/src/features.rs
@@ -0,0 +1,7 @@
+#[cfg(feature = "foo")]
+fn foo() {}
+
+#[cfg(feature = "bar")]
+fn bar() {}
+
+fn always() {}
diff --git a/rust/ql/integration-tests/options/src/lib.rs b/rust/ql/integration-tests/options/src/lib.rs
new file mode 100644
index 00000000000..85d2fb52472
--- /dev/null
+++ b/rust/ql/integration-tests/options/src/lib.rs
@@ -0,0 +1,3 @@
+mod arch;
+mod features;
+mod cfg;
diff --git a/rust/ql/integration-tests/options/test_options.py b/rust/ql/integration-tests/options/test_options.py
new file mode 100644
index 00000000000..dc530832f6f
--- /dev/null
+++ b/rust/ql/integration-tests/options/test_options.py
@@ -0,0 +1,37 @@
+import pytest
+import platform
+import os
+
+
+@pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
+def test_default(codeql, rust):
+    codeql.database.create()
+
+@pytest.mark.ql_test("arch_functions.ql", expected=".Windows.expected")
+def test_target_windows(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=x86_64-pc-windows-msvc")
+
+@pytest.mark.ql_test("arch_functions.ql", expected=".Darwin.expected")
+def test_target_macos(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=aarch64-apple-darwin")
+
+@pytest.mark.ql_test("arch_functions.ql", expected=".Linux.expected")
+def test_target_linux(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=x86_64-unknown-linux-gnu")
+
+@pytest.mark.ql_test("cfg_functions.ql", expected=".override.expected")
+@pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
+def test_cfg_override(codeql, rust):
+    # currently codeql CLI has a limitation not allow to pass `=` in values via `--extractor-option`
+    os.environ["CODEQL_EXTRACTOR_RUST_OPTION_CARGO_CFG_OVERRIDES"] = "cfg_flag,cfg_key=value,-test"
+    codeql.database.create()
+
+@pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
+@pytest.mark.parametrize("features",
+                         [
+                             pytest.param(p,
+                                          marks=pytest.mark.ql_test("feature_functions.ql", expected=f".{e}.expected"))
+                             for p, e in (("foo", "foo"), ("bar", "bar"), ("*", "all"), ("foo,bar", "all"))
+                         ])
+def test_features(codeql, rust, features):
+    codeql.database.create(extractor_option=f"cargo_features={features}")

From f77f2b7ff0ce80cd4564b2430a733845fa67c317 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 8 Nov 2024 17:07:03 +0100
Subject: [PATCH 4/8] Rust: turn off the `test` cfg by default

---
 rust/extractor/src/config.rs                        | 13 ++++++++++++-
 .../options/cfg_functions.override.expected         |  3 ++-
 rust/ql/integration-tests/options/src/cfg.rs        |  7 +++++--
 rust/ql/integration-tests/options/test_options.py   |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index 5e17a458db7..9dba420f1e9 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -137,13 +137,20 @@ fn to_cfg_override(spec: &str) -> CfgAtom {
 fn to_cfg_overrides(specs: &Vec<String>) -> CfgOverrides {
     let mut enabled_cfgs = Vec::new();
     let mut disabled_cfgs = Vec::new();
+    let mut has_test_explicitly_enabled = false;
     for spec in specs {
         if spec.starts_with("-") {
             disabled_cfgs.push(to_cfg_override(&spec[1..]));
         } else {
             enabled_cfgs.push(to_cfg_override(spec));
+            if spec == "test" {
+                has_test_explicitly_enabled = true;
+            }
         }
     }
+    if !has_test_explicitly_enabled {
+        disabled_cfgs.push(to_cfg_override("test"));
+    }
     if let Some(global) = CfgDiff::new(enabled_cfgs, disabled_cfgs) {
         CfgOverrides {
             global,
@@ -151,6 +158,10 @@ fn to_cfg_overrides(specs: &Vec<String>) -> CfgOverrides {
         }
     } else {
         warn!("non-disjoint cfg overrides, ignoring: {}", specs.join(", "));
-        CfgOverrides::default()
+        CfgOverrides {
+            global: CfgDiff::new(Vec::new(), vec![to_cfg_override("test")])
+                .expect("disabling one cfg should always succeed"),
+            ..Default::default()
+        }
     }
 }
diff --git a/rust/ql/integration-tests/options/cfg_functions.override.expected b/rust/ql/integration-tests/options/cfg_functions.override.expected
index 53fa4d12719..3c9253613d0 100644
--- a/rust/ql/integration-tests/options/cfg_functions.override.expected
+++ b/rust/ql/integration-tests/options/cfg_functions.override.expected
@@ -1,3 +1,4 @@
 | src/cfg.rs:1:1:2:16 | cfg_flag |
 | src/cfg.rs:4:1:5:15 | cfg_key |
-| src/cfg.rs:13:1:14:15 | no_test |
+| src/cfg.rs:13:1:14:12 | test |
+| src/cfg.rs:16:1:17:24 | pointer_width_32 |
diff --git a/rust/ql/integration-tests/options/src/cfg.rs b/rust/ql/integration-tests/options/src/cfg.rs
index e88250b6cd8..d748854811b 100644
--- a/rust/ql/integration-tests/options/src/cfg.rs
+++ b/rust/ql/integration-tests/options/src/cfg.rs
@@ -10,5 +10,8 @@ fn cfg_no_flag() {}
 #[cfg(not(cfg_key = "value"))]
 fn cfg_no_key() {}
 
-#[cfg(not(test))]
-fn no_test() {}
+#[cfg(test)]
+fn test() {}
+
+#[cfg(target_pointer_width = "32")]
+fn pointer_width_32() {}
diff --git a/rust/ql/integration-tests/options/test_options.py b/rust/ql/integration-tests/options/test_options.py
index dc530832f6f..17e96de4dcd 100644
--- a/rust/ql/integration-tests/options/test_options.py
+++ b/rust/ql/integration-tests/options/test_options.py
@@ -23,7 +23,7 @@ def test_target_linux(codeql, rust):
 @pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
 def test_cfg_override(codeql, rust):
     # currently codeql CLI has a limitation not allow to pass `=` in values via `--extractor-option`
-    os.environ["CODEQL_EXTRACTOR_RUST_OPTION_CARGO_CFG_OVERRIDES"] = "cfg_flag,cfg_key=value,-test"
+    os.environ["CODEQL_EXTRACTOR_RUST_OPTION_CARGO_CFG_OVERRIDES"] = "cfg_flag,cfg_key=value,-target_pointer_width=64,target_pointer_width=32,test"
     codeql.database.create()
 
 @pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")

From 98b7d50e8af093aeaab9d2c0b49497f8a50257ea Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 8 Nov 2024 18:20:09 +0100
Subject: [PATCH 5/8] Rust: avoid test name with `*`

---
 rust/ql/integration-tests/options/test_options.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rust/ql/integration-tests/options/test_options.py b/rust/ql/integration-tests/options/test_options.py
index 17e96de4dcd..8208b75f703 100644
--- a/rust/ql/integration-tests/options/test_options.py
+++ b/rust/ql/integration-tests/options/test_options.py
@@ -30,7 +30,8 @@ def test_cfg_override(codeql, rust):
 @pytest.mark.parametrize("features",
                          [
                              pytest.param(p,
-                                          marks=pytest.mark.ql_test("feature_functions.ql", expected=f".{e}.expected"))
+                                          marks=pytest.mark.ql_test("feature_functions.ql", expected=f".{e}.expected"),
+                                          id="all" if p == "*" else p)  # CI does not like tests with *...
                              for p, e in (("foo", "foo"), ("bar", "bar"), ("*", "all"), ("foo,bar", "all"))
                          ])
 def test_features(codeql, rust, features):

From 07c59f75622cc328c51d9c836961b0c8d3aa05b6 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Mon, 11 Nov 2024 09:55:46 +0100
Subject: [PATCH 6/8] Rust: fix integration tests

---
 .../integration-tests/options/test_options.py | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/rust/ql/integration-tests/options/test_options.py b/rust/ql/integration-tests/options/test_options.py
index 8208b75f703..73258b41b47 100644
--- a/rust/ql/integration-tests/options/test_options.py
+++ b/rust/ql/integration-tests/options/test_options.py
@@ -22,17 +22,28 @@ def test_target_linux(codeql, rust):
 @pytest.mark.ql_test("cfg_functions.ql", expected=".override.expected")
 @pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
 def test_cfg_override(codeql, rust):
-    # currently codeql CLI has a limitation not allow to pass `=` in values via `--extractor-option`
-    os.environ["CODEQL_EXTRACTOR_RUST_OPTION_CARGO_CFG_OVERRIDES"] = "cfg_flag,cfg_key=value,-target_pointer_width=64,target_pointer_width=32,test"
-    codeql.database.create()
+    overrides = ",".join((
+        "cfg_flag",
+        "cfg_key=value",
+        "-target_pointer_width=64",
+        "target_pointer_width=32",
+        "test",
+    ))
+    codeql.database.create(extractor_option=f"cargo_cfg_overrides={overrides}")
 
 @pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
 @pytest.mark.parametrize("features",
                          [
                              pytest.param(p,
                                           marks=pytest.mark.ql_test("feature_functions.ql", expected=f".{e}.expected"),
-                                          id="all" if p == "*" else p)  # CI does not like tests with *...
-                             for p, e in (("foo", "foo"), ("bar", "bar"), ("*", "all"), ("foo,bar", "all"))
+                                          id=id)
+                             for p, e, id in (
+                                 ("foo", "foo", "foo"),
+                                 ("bar", "bar", "bar"),
+                                 # as long as the integration test runner does not sanitize filenames we must
+                                 # replace `*` and `,` in the parameter id
+                                 ("*", "all", "all"),
+                                 ("foo,bar", "all", "foo+bar"))
                          ])
 def test_features(codeql, rust, features):
     codeql.database.create(extractor_option=f"cargo_features={features}")

From 34361b81eb3a1072da92f907a193d709e07dc6ba Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Mon, 11 Nov 2024 13:11:10 +0100
Subject: [PATCH 7/8] Rust: reorganize options integration tests

---
 .../options/arch_functions.Darwin.expected    |  1 -
 .../options/arch_functions.Linux.expected     |  1 -
 .../options/arch_functions.Windows.expected   |  1 -
 .../options/arch_functions.ql                 |  5 --
 .../integration-tests/options/cfg/Cargo.toml  |  5 ++
 .../options/cfg/functions.expected            |  3 ++
 .../options/cfg/functions.override.expected   |  4 ++
 .../options/cfg/functions.ql                  |  5 ++
 .../options/{src/cfg.rs => cfg/src/lib.rs}    |  3 ++
 .../options/cfg/test_cfg_overrides_option.py  | 19 +++++++
 .../options/cfg_functions.expected            |  2 -
 .../options/cfg_functions.override.expected   |  4 --
 .../options/cfg_functions.ql                  |  5 --
 .../options/feature_functions.all.expected    |  3 --
 .../options/feature_functions.bar.expected    |  2 -
 .../options/feature_functions.expected        |  1 -
 .../options/feature_functions.foo.expected    |  2 -
 .../options/feature_functions.ql              |  5 --
 .../options/{ => features}/Cargo.toml         |  2 +-
 .../options/features/functions.all.expected   |  3 ++
 .../options/features/functions.bar.expected   |  2 +
 .../features/functions.default.expected       |  1 +
 .../options/features/functions.foo.expected   |  2 +
 .../options/features/functions.ql             |  5 ++
 .../{src/features.rs => features/src/lib.rs}  |  0
 .../options/features/test_features_option.py  | 16 ++++++
 rust/ql/integration-tests/options/src/lib.rs  |  3 --
 .../options/target/Cargo.toml                 |  5 ++
 .../options/target/functions.Darwin.expected  |  1 +
 .../options/target/functions.Linux.expected   |  1 +
 .../options/target/functions.Windows.expected |  1 +
 .../options/target/functions.ql               |  5 ++
 .../{src/arch.rs => target/src/lib.rs}        |  0
 .../options/target/test_target_option.py      | 19 +++++++
 .../integration-tests/options/test_options.py | 49 -------------------
 35 files changed, 101 insertions(+), 85 deletions(-)
 delete mode 100644 rust/ql/integration-tests/options/arch_functions.Darwin.expected
 delete mode 100644 rust/ql/integration-tests/options/arch_functions.Linux.expected
 delete mode 100644 rust/ql/integration-tests/options/arch_functions.Windows.expected
 delete mode 100644 rust/ql/integration-tests/options/arch_functions.ql
 create mode 100644 rust/ql/integration-tests/options/cfg/Cargo.toml
 create mode 100644 rust/ql/integration-tests/options/cfg/functions.expected
 create mode 100644 rust/ql/integration-tests/options/cfg/functions.override.expected
 create mode 100644 rust/ql/integration-tests/options/cfg/functions.ql
 rename rust/ql/integration-tests/options/{src/cfg.rs => cfg/src/lib.rs} (80%)
 create mode 100644 rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py
 delete mode 100644 rust/ql/integration-tests/options/cfg_functions.expected
 delete mode 100644 rust/ql/integration-tests/options/cfg_functions.override.expected
 delete mode 100644 rust/ql/integration-tests/options/cfg_functions.ql
 delete mode 100644 rust/ql/integration-tests/options/feature_functions.all.expected
 delete mode 100644 rust/ql/integration-tests/options/feature_functions.bar.expected
 delete mode 100644 rust/ql/integration-tests/options/feature_functions.expected
 delete mode 100644 rust/ql/integration-tests/options/feature_functions.foo.expected
 delete mode 100644 rust/ql/integration-tests/options/feature_functions.ql
 rename rust/ql/integration-tests/options/{ => features}/Cargo.toml (82%)
 create mode 100644 rust/ql/integration-tests/options/features/functions.all.expected
 create mode 100644 rust/ql/integration-tests/options/features/functions.bar.expected
 create mode 100644 rust/ql/integration-tests/options/features/functions.default.expected
 create mode 100644 rust/ql/integration-tests/options/features/functions.foo.expected
 create mode 100644 rust/ql/integration-tests/options/features/functions.ql
 rename rust/ql/integration-tests/options/{src/features.rs => features/src/lib.rs} (100%)
 create mode 100644 rust/ql/integration-tests/options/features/test_features_option.py
 delete mode 100644 rust/ql/integration-tests/options/src/lib.rs
 create mode 100644 rust/ql/integration-tests/options/target/Cargo.toml
 create mode 100644 rust/ql/integration-tests/options/target/functions.Darwin.expected
 create mode 100644 rust/ql/integration-tests/options/target/functions.Linux.expected
 create mode 100644 rust/ql/integration-tests/options/target/functions.Windows.expected
 create mode 100644 rust/ql/integration-tests/options/target/functions.ql
 rename rust/ql/integration-tests/options/{src/arch.rs => target/src/lib.rs} (100%)
 create mode 100644 rust/ql/integration-tests/options/target/test_target_option.py
 delete mode 100644 rust/ql/integration-tests/options/test_options.py

diff --git a/rust/ql/integration-tests/options/arch_functions.Darwin.expected b/rust/ql/integration-tests/options/arch_functions.Darwin.expected
deleted file mode 100644
index 64505ef2aaf..00000000000
--- a/rust/ql/integration-tests/options/arch_functions.Darwin.expected
+++ /dev/null
@@ -1 +0,0 @@
-| src/arch.rs:7:1:8:13 | macos |
diff --git a/rust/ql/integration-tests/options/arch_functions.Linux.expected b/rust/ql/integration-tests/options/arch_functions.Linux.expected
deleted file mode 100644
index ed290cbad69..00000000000
--- a/rust/ql/integration-tests/options/arch_functions.Linux.expected
+++ /dev/null
@@ -1 +0,0 @@
-| src/arch.rs:1:1:2:13 | linux |
diff --git a/rust/ql/integration-tests/options/arch_functions.Windows.expected b/rust/ql/integration-tests/options/arch_functions.Windows.expected
deleted file mode 100644
index bb0067e8a2a..00000000000
--- a/rust/ql/integration-tests/options/arch_functions.Windows.expected
+++ /dev/null
@@ -1 +0,0 @@
-| src/arch.rs:4:1:5:15 | windows |
diff --git a/rust/ql/integration-tests/options/arch_functions.ql b/rust/ql/integration-tests/options/arch_functions.ql
deleted file mode 100644
index 2bb3182e6e7..00000000000
--- a/rust/ql/integration-tests/options/arch_functions.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import rust
-
-from Function f
-where f.getLocation().getFile().getBaseName() = "arch.rs" and f.hasExtendedCanonicalPath()
-select f
diff --git a/rust/ql/integration-tests/options/cfg/Cargo.toml b/rust/ql/integration-tests/options/cfg/Cargo.toml
new file mode 100644
index 00000000000..c5cbf8722f1
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+[package]
+name = "cfg"
+version = "0.1.0"
+edition = "2021"
diff --git a/rust/ql/integration-tests/options/cfg/functions.expected b/rust/ql/integration-tests/options/cfg/functions.expected
new file mode 100644
index 00000000000..a2042c5e4c4
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/functions.expected
@@ -0,0 +1,3 @@
+| src/lib.rs:7:1:8:19 | cfg_no_flag |
+| src/lib.rs:10:1:11:18 | cfg_no_key |
+| src/lib.rs:16:1:17:24 | pointer_width_64 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.override.expected b/rust/ql/integration-tests/options/cfg/functions.override.expected
new file mode 100644
index 00000000000..4a19db56a74
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/functions.override.expected
@@ -0,0 +1,4 @@
+| src/lib.rs:1:1:2:16 | cfg_flag |
+| src/lib.rs:4:1:5:15 | cfg_key |
+| src/lib.rs:13:1:14:12 | test |
+| src/lib.rs:19:1:20:24 | pointer_width_32 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.ql b/rust/ql/integration-tests/options/cfg/functions.ql
new file mode 100644
index 00000000000..da7b22cf584
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/src/cfg.rs b/rust/ql/integration-tests/options/cfg/src/lib.rs
similarity index 80%
rename from rust/ql/integration-tests/options/src/cfg.rs
rename to rust/ql/integration-tests/options/cfg/src/lib.rs
index d748854811b..1643ffbf2ad 100644
--- a/rust/ql/integration-tests/options/src/cfg.rs
+++ b/rust/ql/integration-tests/options/cfg/src/lib.rs
@@ -13,5 +13,8 @@ fn cfg_no_key() {}
 #[cfg(test)]
 fn test() {}
 
+#[cfg(target_pointer_width = "64")]
+fn pointer_width_64() {}
+
 #[cfg(target_pointer_width = "32")]
 fn pointer_width_32() {}
diff --git a/rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py b/rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py
new file mode 100644
index 00000000000..aa5f3cd3b2e
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py
@@ -0,0 +1,19 @@
+import pytest
+import platform
+import os
+
+
+def test_default(codeql, rust):
+    codeql.database.create()
+
+
+@pytest.mark.ql_test(expected=".override.expected")
+def test_cfg_overrides(codeql, rust):
+    overrides = ",".join((
+        "cfg_flag",
+        "cfg_key=value",
+        "-target_pointer_width=64",
+        "target_pointer_width=32",
+        "test",
+    ))
+    codeql.database.create(extractor_option=f"cargo_cfg_overrides={overrides}")
diff --git a/rust/ql/integration-tests/options/cfg_functions.expected b/rust/ql/integration-tests/options/cfg_functions.expected
deleted file mode 100644
index 521e16ac1dd..00000000000
--- a/rust/ql/integration-tests/options/cfg_functions.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| src/cfg.rs:7:1:8:19 | cfg_no_flag |
-| src/cfg.rs:10:1:11:18 | cfg_no_key |
diff --git a/rust/ql/integration-tests/options/cfg_functions.override.expected b/rust/ql/integration-tests/options/cfg_functions.override.expected
deleted file mode 100644
index 3c9253613d0..00000000000
--- a/rust/ql/integration-tests/options/cfg_functions.override.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| src/cfg.rs:1:1:2:16 | cfg_flag |
-| src/cfg.rs:4:1:5:15 | cfg_key |
-| src/cfg.rs:13:1:14:12 | test |
-| src/cfg.rs:16:1:17:24 | pointer_width_32 |
diff --git a/rust/ql/integration-tests/options/cfg_functions.ql b/rust/ql/integration-tests/options/cfg_functions.ql
deleted file mode 100644
index 6ba57e61a9d..00000000000
--- a/rust/ql/integration-tests/options/cfg_functions.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import rust
-
-from Function f
-where f.getLocation().getFile().getBaseName() = "cfg.rs" and f.hasExtendedCanonicalPath()
-select f
diff --git a/rust/ql/integration-tests/options/feature_functions.all.expected b/rust/ql/integration-tests/options/feature_functions.all.expected
deleted file mode 100644
index dcf10884778..00000000000
--- a/rust/ql/integration-tests/options/feature_functions.all.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| src/features.rs:1:1:2:11 | foo |
-| src/features.rs:4:1:5:11 | bar |
-| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.bar.expected b/rust/ql/integration-tests/options/feature_functions.bar.expected
deleted file mode 100644
index 1e7a67b1c16..00000000000
--- a/rust/ql/integration-tests/options/feature_functions.bar.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| src/features.rs:4:1:5:11 | bar |
-| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.expected b/rust/ql/integration-tests/options/feature_functions.expected
deleted file mode 100644
index 12ef01e541a..00000000000
--- a/rust/ql/integration-tests/options/feature_functions.expected
+++ /dev/null
@@ -1 +0,0 @@
-| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.foo.expected b/rust/ql/integration-tests/options/feature_functions.foo.expected
deleted file mode 100644
index 6a4b294edd1..00000000000
--- a/rust/ql/integration-tests/options/feature_functions.foo.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| src/features.rs:1:1:2:11 | foo |
-| src/features.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/feature_functions.ql b/rust/ql/integration-tests/options/feature_functions.ql
deleted file mode 100644
index 547e3ab9713..00000000000
--- a/rust/ql/integration-tests/options/feature_functions.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import rust
-
-from Function f
-where f.getLocation().getFile().getBaseName() = "features.rs" and f.hasExtendedCanonicalPath()
-select f
diff --git a/rust/ql/integration-tests/options/Cargo.toml b/rust/ql/integration-tests/options/features/Cargo.toml
similarity index 82%
rename from rust/ql/integration-tests/options/Cargo.toml
rename to rust/ql/integration-tests/options/features/Cargo.toml
index c75338009fe..7faf9f167be 100644
--- a/rust/ql/integration-tests/options/Cargo.toml
+++ b/rust/ql/integration-tests/options/features/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 [package]
-name = "options"
+name = "features"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/rust/ql/integration-tests/options/features/functions.all.expected b/rust/ql/integration-tests/options/features/functions.all.expected
new file mode 100644
index 00000000000..5ce4cae2ab0
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.all.expected
@@ -0,0 +1,3 @@
+| src/lib.rs:1:1:2:11 | foo |
+| src/lib.rs:4:1:5:11 | bar |
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.bar.expected b/rust/ql/integration-tests/options/features/functions.bar.expected
new file mode 100644
index 00000000000..cad441d6749
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.bar.expected
@@ -0,0 +1,2 @@
+| src/lib.rs:4:1:5:11 | bar |
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.default.expected b/rust/ql/integration-tests/options/features/functions.default.expected
new file mode 100644
index 00000000000..523c2187688
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.default.expected
@@ -0,0 +1 @@
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.foo.expected b/rust/ql/integration-tests/options/features/functions.foo.expected
new file mode 100644
index 00000000000..b7875423083
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.foo.expected
@@ -0,0 +1,2 @@
+| src/lib.rs:1:1:2:11 | foo |
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.ql b/rust/ql/integration-tests/options/features/functions.ql
new file mode 100644
index 00000000000..da7b22cf584
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/src/features.rs b/rust/ql/integration-tests/options/features/src/lib.rs
similarity index 100%
rename from rust/ql/integration-tests/options/src/features.rs
rename to rust/ql/integration-tests/options/features/src/lib.rs
diff --git a/rust/ql/integration-tests/options/features/test_features_option.py b/rust/ql/integration-tests/options/features/test_features_option.py
new file mode 100644
index 00000000000..5617f707c8f
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/test_features_option.py
@@ -0,0 +1,16 @@
+import pytest
+
+
+@pytest.mark.parametrize("option",
+                         [
+                             pytest.param(p,
+                                          marks=pytest.mark.ql_test(expected=f".{e}.expected"))
+                             for p, e in (
+                                 (None, "default"),
+                                 ("cargo_features=foo", "foo"),
+                                 ("cargo_features=bar", "bar"),
+                                 ("cargo_features=*", "all"),
+                                 ("cargo_features=foo,bar", "all"))
+                         ])
+def test_features(codeql, rust, option):
+    codeql.database.create(extractor_option=option)
diff --git a/rust/ql/integration-tests/options/src/lib.rs b/rust/ql/integration-tests/options/src/lib.rs
deleted file mode 100644
index 85d2fb52472..00000000000
--- a/rust/ql/integration-tests/options/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod arch;
-mod features;
-mod cfg;
diff --git a/rust/ql/integration-tests/options/target/Cargo.toml b/rust/ql/integration-tests/options/target/Cargo.toml
new file mode 100644
index 00000000000..90a82fb6a07
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+[package]
+name = "target"
+version = "0.1.0"
+edition = "2021"
diff --git a/rust/ql/integration-tests/options/target/functions.Darwin.expected b/rust/ql/integration-tests/options/target/functions.Darwin.expected
new file mode 100644
index 00000000000..217974bb7c6
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.Darwin.expected
@@ -0,0 +1 @@
+| src/lib.rs:7:1:8:13 | macos |
diff --git a/rust/ql/integration-tests/options/target/functions.Linux.expected b/rust/ql/integration-tests/options/target/functions.Linux.expected
new file mode 100644
index 00000000000..57662579f1f
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.Linux.expected
@@ -0,0 +1 @@
+| src/lib.rs:1:1:2:13 | linux |
diff --git a/rust/ql/integration-tests/options/target/functions.Windows.expected b/rust/ql/integration-tests/options/target/functions.Windows.expected
new file mode 100644
index 00000000000..8ae2d8c86cc
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.Windows.expected
@@ -0,0 +1 @@
+| src/lib.rs:4:1:5:15 | windows |
diff --git a/rust/ql/integration-tests/options/target/functions.ql b/rust/ql/integration-tests/options/target/functions.ql
new file mode 100644
index 00000000000..da7b22cf584
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/src/arch.rs b/rust/ql/integration-tests/options/target/src/lib.rs
similarity index 100%
rename from rust/ql/integration-tests/options/src/arch.rs
rename to rust/ql/integration-tests/options/target/src/lib.rs
diff --git a/rust/ql/integration-tests/options/target/test_target_option.py b/rust/ql/integration-tests/options/target/test_target_option.py
new file mode 100644
index 00000000000..3cb1db7513d
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/test_target_option.py
@@ -0,0 +1,19 @@
+import pytest
+import platform
+
+
+@pytest.mark.ql_test(expected=f".{platform.system()}.expected")
+def test_default(codeql, rust):
+    codeql.database.create()
+
+@pytest.mark.ql_test(expected=".Windows.expected")
+def test_target_windows(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=x86_64-pc-windows-msvc")
+
+@pytest.mark.ql_test(expected=".Darwin.expected")
+def test_target_macos(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=aarch64-apple-darwin")
+
+@pytest.mark.ql_test(expected=".Linux.expected")
+def test_target_linux(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=x86_64-unknown-linux-gnu")
diff --git a/rust/ql/integration-tests/options/test_options.py b/rust/ql/integration-tests/options/test_options.py
deleted file mode 100644
index 73258b41b47..00000000000
--- a/rust/ql/integration-tests/options/test_options.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import pytest
-import platform
-import os
-
-
-@pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
-def test_default(codeql, rust):
-    codeql.database.create()
-
-@pytest.mark.ql_test("arch_functions.ql", expected=".Windows.expected")
-def test_target_windows(codeql, rust):
-    codeql.database.create(extractor_option="cargo_target=x86_64-pc-windows-msvc")
-
-@pytest.mark.ql_test("arch_functions.ql", expected=".Darwin.expected")
-def test_target_macos(codeql, rust):
-    codeql.database.create(extractor_option="cargo_target=aarch64-apple-darwin")
-
-@pytest.mark.ql_test("arch_functions.ql", expected=".Linux.expected")
-def test_target_linux(codeql, rust):
-    codeql.database.create(extractor_option="cargo_target=x86_64-unknown-linux-gnu")
-
-@pytest.mark.ql_test("cfg_functions.ql", expected=".override.expected")
-@pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
-def test_cfg_override(codeql, rust):
-    overrides = ",".join((
-        "cfg_flag",
-        "cfg_key=value",
-        "-target_pointer_width=64",
-        "target_pointer_width=32",
-        "test",
-    ))
-    codeql.database.create(extractor_option=f"cargo_cfg_overrides={overrides}")
-
-@pytest.mark.ql_test("arch_functions.ql", expected=f".{platform.system()}.expected")
-@pytest.mark.parametrize("features",
-                         [
-                             pytest.param(p,
-                                          marks=pytest.mark.ql_test("feature_functions.ql", expected=f".{e}.expected"),
-                                          id=id)
-                             for p, e, id in (
-                                 ("foo", "foo", "foo"),
-                                 ("bar", "bar", "bar"),
-                                 # as long as the integration test runner does not sanitize filenames we must
-                                 # replace `*` and `,` in the parameter id
-                                 ("*", "all", "all"),
-                                 ("foo,bar", "all", "foo+bar"))
-                         ])
-def test_features(codeql, rust, features):
-    codeql.database.create(extractor_option=f"cargo_features={features}")

From 5ef92a281b9d883db3f2da53a3fb4b39af3946d1 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Mon, 11 Nov 2024 13:37:25 +0100
Subject: [PATCH 8/8] Rust: fix integration test on windows

---
 ...ions.default.expected => functions.expected} |  0
 .../options/features/test_features_option.py    | 17 +++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename rust/ql/integration-tests/options/features/{functions.default.expected => functions.expected} (100%)

diff --git a/rust/ql/integration-tests/options/features/functions.default.expected b/rust/ql/integration-tests/options/features/functions.expected
similarity index 100%
rename from rust/ql/integration-tests/options/features/functions.default.expected
rename to rust/ql/integration-tests/options/features/functions.expected
diff --git a/rust/ql/integration-tests/options/features/test_features_option.py b/rust/ql/integration-tests/options/features/test_features_option.py
index 5617f707c8f..75c5058be07 100644
--- a/rust/ql/integration-tests/options/features/test_features_option.py
+++ b/rust/ql/integration-tests/options/features/test_features_option.py
@@ -1,16 +1,17 @@
 import pytest
 
+def test_default(codeql, rust):
+    codeql.database.create()
 
-@pytest.mark.parametrize("option",
+@pytest.mark.parametrize("features",
                          [
                              pytest.param(p,
                                           marks=pytest.mark.ql_test(expected=f".{e}.expected"))
                              for p, e in (
-                                 (None, "default"),
-                                 ("cargo_features=foo", "foo"),
-                                 ("cargo_features=bar", "bar"),
-                                 ("cargo_features=*", "all"),
-                                 ("cargo_features=foo,bar", "all"))
+                                 ("foo", "foo"),
+                                 ("bar", "bar"),
+                                 ("*", "all"),
+                                 ("foo,bar", "all"))
                          ])
-def test_features(codeql, rust, option):
-    codeql.database.create(extractor_option=option)
+def test_features(codeql, rust, features):
+    codeql.database.create(extractor_option=f"cargo_features={features}")