From ccb2924362428d32c74c142c3e6d365fd48a2386 Mon Sep 17 00:00:00 2001 From: daimond113 <72147841+daimond113@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:37:30 +0100 Subject: [PATCH] feat: remove old includes compat --- CHANGELOG.md | 3 ++ src/cli/commands/publish.rs | 20 +++------ src/lib.rs | 86 ++----------------------------------- 3 files changed, 12 insertions(+), 97 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d967bf1..cfbfd2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support using aliases of own dependencies for overrides by @daimond113 - Support ignoring parse errors in Luau files by @daimond113 +### Removed +- Remove old includes format compatibility by @daimond113 + ### Performance - Use `Arc` for more efficient cloning of multiple structs by @daimond113 - Avoid cloning where possible by @daimond113 diff --git a/src/cli/commands/publish.rs b/src/cli/commands/publish.rs index cdb2c4c..a1e0b96 100644 --- a/src/cli/commands/publish.rs +++ b/src/cli/commands/publish.rs @@ -4,30 +4,22 @@ use async_compression::Level; use clap::Args; use colored::Colorize; use fs_err::tokio as fs; -#[allow(deprecated)] use pesde::{ manifest::{target::Target, DependencyType}, - matching_globs_old_behaviour, + matching_globs, scripts::ScriptName, source::{ git_index::GitBasedSource, pesde::{specifier::PesdeDependencySpecifier, PesdePackageSource}, specifiers::DependencySpecifiers, - traits::PackageSource, + traits::{PackageSource, RefreshOptions, ResolveOptions}, workspace::{ specifier::{VersionType, VersionTypeOrReq}, WorkspacePackageSource, }, - IGNORED_DIRS, IGNORED_FILES, + PackageSources, IGNORED_DIRS, IGNORED_FILES, }, - Project, DEFAULT_INDEX_NAME, MANIFEST_FILE_NAME, -}; -use pesde::{ - source::{ - traits::{RefreshOptions, ResolveOptions}, - PackageSources, - }, - RefreshedSources, + Project, RefreshedSources, DEFAULT_INDEX_NAME, MANIFEST_FILE_NAME, }; use reqwest::{header::AUTHORIZATION, StatusCode}; use semver::VersionReq; @@ -162,11 +154,11 @@ impl PublishCommand { _ => None, }; - #[allow(deprecated)] - let mut paths = matching_globs_old_behaviour( + let mut paths = matching_globs( project.package_dir(), manifest.includes.iter().map(|s| s.as_str()), true, + false, ) .await .context("failed to get included files")?; diff --git a/src/lib.rs b/src/lib.rs index 58eb996..a30a468 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,7 +11,7 @@ use crate::{ PackageSources, }, }; -use async_stream::stream; +use async_stream::try_stream; use fs_err::tokio as fs; use futures::Stream; use gix::sec::identity::Account; @@ -240,7 +240,7 @@ impl Project { ) .await?; - Ok(stream! { + Ok(try_stream! { for path in members { let manifest = fs::read_to_string(path.join(MANIFEST_FILE_NAME)) .await @@ -249,92 +249,12 @@ impl Project { errors::WorkspaceMembersError::ManifestDeser(path.clone(), Box::new(e)) })?; - yield Ok((path, manifest)); + yield (path, manifest); } }) } } -/// Gets all matching paths in a directory -#[deprecated( - since = "0.5.0-rc.13", - note = "use `matching_globs` instead, which does not have the old behaviour of including whole directories by their name (`src` instead of `src/**`)" -)] -#[instrument(ret, level = "trace")] -pub async fn matching_globs_old_behaviour< - 'a, - P: AsRef + Debug, - I: IntoIterator + Debug, ->( - dir: P, - globs: I, - relative: bool, -) -> Result, errors::MatchingGlobsError> { - let (negative_globs, positive_globs) = globs - .into_iter() - .partition::, _>(|glob| glob.starts_with('!')); - - let negative_globs = wax::any( - negative_globs - .into_iter() - .map(|glob| wax::Glob::new(&glob[1..])) - .collect::, _>>()?, - )?; - - let (positive_globs, file_names) = positive_globs - .into_iter() - // only globs we can be sure of (maintaining compatibility with old "only file/dir name" system) - .partition::, _>(|glob| glob.contains('/')); - let file_names = file_names.into_iter().collect::>(); - - let positive_globs = wax::any( - positive_globs - .into_iter() - .map(wax::Glob::new) - .collect::, _>>()?, - )?; - - let mut read_dirs = vec![(fs::read_dir(dir.as_ref().to_path_buf()).await?, false)]; - let mut paths = HashSet::new(); - - let mut is_root = true; - - while let Some((mut read_dir, is_entire_dir_included)) = read_dirs.pop() { - while let Some(entry) = read_dir.next_entry().await? { - let path = entry.path(); - let relative_path = path.strip_prefix(dir.as_ref()).unwrap(); - let file_name = path.file_name().unwrap(); - let is_filename_match = - is_root && file_name.to_str().is_some_and(|s| file_names.contains(s)); - - if entry.file_type().await?.is_dir() { - read_dirs.push(( - fs::read_dir(&path).await?, - is_entire_dir_included || is_filename_match, - )); - if is_filename_match { - tracing::warn!("directory name usage found for {}. this is deprecated and will be removed in the future", path.display()); - } - } - - if (is_entire_dir_included || is_filename_match) - || (positive_globs.is_match(relative_path) - && !negative_globs.is_match(relative_path)) - { - paths.insert(if relative { - relative_path.to_path_buf() - } else { - path.to_path_buf() - }); - } - } - - is_root = false; - } - - Ok(paths) -} - /// Gets all matching paths in a directory #[instrument(ret, level = "trace")] pub async fn matching_globs<'a, P: AsRef + Debug, I: IntoIterator + Debug>(