From aae9619d3d522986dd2c62d0cf7acc5a152352b5 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Tue, 6 Aug 2024 20:21:25 +0100 Subject: [PATCH] [red-knot] Fix build on Windows (#12719) ## Summary Tests are failing on `main` because automerge landed https://github.com/astral-sh/ruff/pull/12716 despite the Windows tests failing. --- crates/red_knot_module_resolver/src/resolver.rs | 6 ++++-- crates/red_knot_workspace/src/site_packages.rs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/red_knot_module_resolver/src/resolver.rs b/crates/red_knot_module_resolver/src/resolver.rs index 8150643b54..14a7c826db 100644 --- a/crates/red_knot_module_resolver/src/resolver.rs +++ b/crates/red_knot_module_resolver/src/resolver.rs @@ -603,7 +603,6 @@ impl PackageKind { #[cfg(test)] mod tests { - use anyhow::Context; use ruff_db::files::{system_path_to_file, File, FilePath}; use ruff_db::system::DbWithTestSystem; use ruff_db::testing::{ @@ -1133,10 +1132,13 @@ mod tests { #[test] #[cfg(target_family = "unix")] fn symlink() -> anyhow::Result<()> { - use crate::db::tests::TestDb; + use anyhow::Context; + use ruff_db::program::Program; use ruff_db::system::{OsSystem, SystemPath}; + use crate::db::tests::TestDb; + let mut db = TestDb::new(); let temp_dir = tempfile::tempdir()?; diff --git a/crates/red_knot_workspace/src/site_packages.rs b/crates/red_knot_workspace/src/site_packages.rs index b457d6daca..f076e1675a 100644 --- a/crates/red_knot_workspace/src/site_packages.rs +++ b/crates/red_knot_workspace/src/site_packages.rs @@ -35,7 +35,7 @@ fn site_packages_dir_from_sys_prefix( sys_prefix_path: &SystemPath, system: &dyn System, ) -> Result { - let site_packages = venv_path.join("Lib/site-packages"); + let site_packages = sys_prefix_path.join("Lib/site-packages"); system .is_directory(&site_packages) .then_some(site_packages)