Merge pull request #17491 from github/redsun82/rust-integration-test

Rust: add basic integration tests and fix archiving on Windows

Author: redsun82

Cargo.lock

@@ -25,3 +25,4 @@ triomphe = "0.1.13"
 argfile = "0.2.1"
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
+itertools = "0.13.0"

rust/extractor/Cargo.toml

@@ -1,4 +1,4 @@
-use crate::path;
+use codeql_extractor::file_paths;
 use log::{debug, warn};
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -15,12 +15,11 @@ impl Archiver {
     }
 
     fn try_archive(&self, source: &Path) -> std::io::Result<()> {
-        let mut dest = self.root.clone();
-        dest.push(path::key(source));
-        let parent = dest.parent().unwrap();
+        let dest = file_paths::path_for(&self.root, source, "");
         if fs::metadata(&dest).is_ok() {
             return Ok(());
         }
+        let parent = dest.parent().unwrap();
         fs::create_dir_all(parent)?;
         fs::copy(source, dest)?;
         debug!("archived {}", source.display());

rust/extractor/src/archive.rs

@@ -1,5 +1,7 @@
 use crate::trap::TrapId;
 use anyhow::Context;
+use itertools::Itertools;
+use log::info;
 use ra_ap_hir::db::DefDatabase;
 use ra_ap_hir::Crate;
 use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
@@ -11,7 +13,6 @@ use std::path::PathBuf;
 mod archive;
 mod config;
 pub mod generated;
-pub mod path;
 mod translate;
 pub mod trap;
 
@@ -23,9 +24,12 @@ fn find_project_manifests(
         .iter()
         .map(|path| AbsPathBuf::assert_utf8(current.join(path)))
         .collect();
-    Ok(ra_ap_project_model::ProjectManifest::discover_all(
-        &abs_files,
-    ))
+    let ret = ra_ap_project_model::ProjectManifest::discover_all(&abs_files);
+    info!(
+        "found manifests: {}",
+        ret.iter().map(|m| format!("{m}")).join(", ")
+    );
+    Ok(ret)
 }
 
 fn main() -> anyhow::Result<()> {

rust/extractor/src/main.rs

@@ -1,9 +1,8 @@
+use crate::config;
 use crate::config::Compression;
-use crate::{config, path};
-use codeql_extractor::{extractor, trap};
+use codeql_extractor::{extractor, file_paths, trap};
 use log::debug;
 use ra_ap_ide_db::line_index::LineCol;
-use std::ffi::OsString;
 use std::fmt::Debug;
 use std::hash::Hash;
 use std::marker::PhantomData;
@@ -12,7 +11,6 @@ use std::path::{Path, PathBuf};
 pub use trap::Label as UntypedLabel;
 pub use trap::Writer;
 
-//TODO: typed labels
 pub trait AsTrapKeyPart {
     fn as_key_part(&self) -> String;
 }
@@ -210,19 +208,8 @@ impl TrapFileProvider {
     }
 
     pub fn create(&self, category: &str, key: &Path) -> TrapFile {
-        let mut path = PathBuf::from(category);
-        path.push(path::key(key));
-        path.set_extension(
-            path.extension()
-                .map(|e| {
-                    let mut o: OsString = e.to_owned();
-                    o.push(".trap");
-                    o
-                })
-                .unwrap_or("trap".into()),
-        );
+        let path = file_paths::path_for(&self.trap_dir.join(category), key, ".trap");
         debug!("creating trap file {}", path.display());
-        path = self.trap_dir.join(path);
         let mut writer = trap::Writer::new();
         extractor::populate_empty_location(&mut writer);
         TrapFile {

rust/extractor/src/path.rs

@@ -0,0 +1,15 @@
+import pytest
+import shutil
+
+class _Manifests:
+    def __init__(self, cwd):
+        self.dir = cwd / "manifests"
+
+    def select(self, name: str):
+        (self.dir / name).rename(name)
+        shutil.rmtree(self.dir)
+
+
+@pytest.fixture
+def manifests(cwd):
+    return _Manifests(cwd)

rust/extractor/src/trap.rs

@@ -0,0 +1 @@
+| src/main.rs:4:1:6:1 | main |

rust/integration-tests/conftest.py

@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f

rust/integration-tests/hello-project/functions.expected

@@ -0,0 +1,7 @@
+[workspace]
+[package]
+name = "hello-cargo"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]