pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2025-04-20 03:43:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: compile out patches without feature

Browse source
This commit is contained in:
daimond113 2025-02-10 08:55:41 +01:00
parent faaa76cf0d
commit b6799e7400
No known key found for this signature in database
GPG key ID: 640DC95EC1190354
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/linking/incremental.rs
View file

@ -1,7 +1,6 @@
use crate::{ use crate::{
all_packages_dirs, graph::DependencyGraphWithTarget, manifest::Alias, patches::remove_patch, all_packages_dirs, graph::DependencyGraphWithTarget, manifest::Alias, source::ids::PackageId,
source::ids::PackageId, util::remove_empty_dir, Project, PACKAGES_CONTAINER_NAME, util::remove_empty_dir, Project, PACKAGES_CONTAINER_NAME, SCRIPTS_LINK_FOLDER,
SCRIPTS_LINK_FOLDER,
}; };
use fs_err::tokio as fs; use fs_err::tokio as fs;
use futures::FutureExt; use futures::FutureExt;
@ -17,7 +16,7 @@ fn index_entry(
packages_index_dir: &Path, packages_index_dir: &Path,
tasks: &mut JoinSet<Result<(), errors::RemoveUnusedError>>, tasks: &mut JoinSet<Result<(), errors::RemoveUnusedError>>,
used_paths: &Arc<HashSet<PathBuf>>, used_paths: &Arc<HashSet<PathBuf>>,
patched_packages: &Arc<HashSet<PathBuf>>, #[cfg(feature = "patches")] patched_packages: &Arc<HashSet<PathBuf>>,
) { ) {
fn get_package_name_from_container(container: &Path) -> (bool, String) { fn get_package_name_from_container(container: &Path) -> (bool, String) {
let Component::Normal(first_component) = container.components().next().unwrap() else { let Component::Normal(first_component) = container.components().next().unwrap() else {
@ -55,8 +54,11 @@ fn index_entry(
{ {
if !used_paths.contains(&path_relative) { if !used_paths.contains(&path_relative) {
fs::remove_dir_all(path).await?; fs::remove_dir_all(path).await?;
} else if !patched_packages.contains(&path_relative) { } else {
remove_patch(path.join(package_name)).await?; #[cfg(feature = "patches")]
if !patched_packages.contains(&path_relative) {
crate::patches::remove_patch(path.join(package_name)).await?;
}
} }
return Ok(()); return Ok(());
@ -71,9 +73,12 @@ fn index_entry(
let path_relative = path_relative.join(&version); let path_relative = path_relative.join(&version);
if used_paths.contains(&path_relative) { if used_paths.contains(&path_relative) {
#[cfg(feature = "patches")]
if !patched_packages.contains(&path_relative) { if !patched_packages.contains(&path_relative) {
let path = entry.path().join(&package_name); let path = entry.path().join(&package_name);
tasks.spawn(async { remove_patch(path).await.map_err(Into::into) }); tasks.spawn(async {
crate::patches::remove_patch(path).await.map_err(Into::into)
});
} }
continue; continue;
} }
@ -175,6 +180,7 @@ impl Project {
}) })
.collect::<HashSet<_>>(); .collect::<HashSet<_>>();
let used_paths = Arc::new(used_paths); let used_paths = Arc::new(used_paths);
#[cfg(feature = "patches")]
let patched_packages = manifest let patched_packages = manifest
.patches .patches
.iter() .iter()
@ -192,6 +198,7 @@ impl Project {
.to_path_buf() .to_path_buf()
}) })
.collect::<HashSet<_>>(); .collect::<HashSet<_>>();
#[cfg(feature = "patches")]
let patched_packages = Arc::new(patched_packages); let patched_packages = Arc::new(patched_packages);
let mut tasks = all_packages_dirs() let mut tasks = all_packages_dirs()
@ -200,6 +207,7 @@ impl Project {
let packages_dir = self.package_dir().join(&folder); let packages_dir = self.package_dir().join(&folder);
let packages_index_dir = packages_dir.join(PACKAGES_CONTAINER_NAME); let packages_index_dir = packages_dir.join(PACKAGES_CONTAINER_NAME);
let used_paths = used_paths.clone(); let used_paths = used_paths.clone();
#[cfg(feature = "patches")]
let patched_packages = patched_packages.clone(); let patched_packages = patched_packages.clone();
let expected_aliases = graph let expected_aliases = graph
@ -235,6 +243,7 @@ impl Project {
&packages_index_dir, &packages_index_dir,
&mut tasks, &mut tasks,
&used_paths, &used_paths,
#[cfg(feature = "patches")]
&patched_packages, &patched_packages,
); );
} }