From 8137419d93cf900618a60daeac3716f03b401e1b Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Mon, 18 Nov 2024 10:40:29 +0100
Subject: [PATCH] Rust: only accept `options.yml` in QL tests

---
 rust/extractor/src/config.rs                              | 8 +-------
 .../qltest/failing_cargo_check/{options => options.yml}   | 0
 .../extractor-tests/generated/{options => options.yml}    | 0
 .../library-tests/controlflow/{options => options.yml}    | 0
 rust/ql/test/{options => options.yml}                     | 0
 .../test/query-tests/diagnostics/{options => options.yml} | 0
 6 files changed, 1 insertion(+), 7 deletions(-)
 rename rust/ql/integration-tests/qltest/failing_cargo_check/{options => options.yml} (100%)
 rename rust/ql/test/extractor-tests/generated/{options => options.yml} (100%)
 rename rust/ql/test/library-tests/controlflow/{options => options.yml} (100%)
 rename rust/ql/test/{options => options.yml} (100%)
 rename rust/ql/test/query-tests/diagnostics/{options => options.yml} (100%)

diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index 8520df189304..fda866c24c8d 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -62,13 +62,7 @@ impl Config {
                 .ancestors()
                 // only travel up while we're within the test pack
                 .take_while_inclusive(|p| !p.join("qlpack.yml").exists())
-                .flat_map(|p| {
-                    [
-                        p.join("options"),
-                        p.join("options.yml"),
-                        p.join("options.yaml"),
-                    ]
-                })
+                .map(|p| p.join("options.yml"))
                 .filter(|p| p.exists())
                 .collect_vec();
             option_files.reverse();
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/options b/rust/ql/integration-tests/qltest/failing_cargo_check/options.yml
similarity index 100%
rename from rust/ql/integration-tests/qltest/failing_cargo_check/options
rename to rust/ql/integration-tests/qltest/failing_cargo_check/options.yml
diff --git a/rust/ql/test/extractor-tests/generated/options b/rust/ql/test/extractor-tests/generated/options.yml
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/options
rename to rust/ql/test/extractor-tests/generated/options.yml
diff --git a/rust/ql/test/library-tests/controlflow/options b/rust/ql/test/library-tests/controlflow/options.yml
similarity index 100%
rename from rust/ql/test/library-tests/controlflow/options
rename to rust/ql/test/library-tests/controlflow/options.yml
diff --git a/rust/ql/test/options b/rust/ql/test/options.yml
similarity index 100%
rename from rust/ql/test/options
rename to rust/ql/test/options.yml
diff --git a/rust/ql/test/query-tests/diagnostics/options b/rust/ql/test/query-tests/diagnostics/options.yml
similarity index 100%
rename from rust/ql/test/query-tests/diagnostics/options
rename to rust/ql/test/query-tests/diagnostics/options.yml