mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-24 05:35:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

uv-pypi-types: rename "conflicting group" types to more generic "conflicts"

Browse source 
Since this is intended to support _both_ groups and extras, it doesn't
make sense to just name it for groups. And since there isn't really a
word that encapsulates both "extra" and "group," we just fall back to
the super general "conflicts."

We'll rename the variables and other things in the next commit.
This commit is contained in:
Andrew Gallant 2024-11-13 10:08:36 -05:00 • committed by Andrew Gallant
parent 84d50ce81a
commit 19a044d4db
17 changed files with 150 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/uv-workspace/src/workspace.rs
View file

@ -11,7 +11,7 @@ use uv_distribution_types::Index;
use uv_fs::{Simplified, CWD};
use uv_normalize::{GroupName, PackageName, DEV_DEPENDENCIES};
use uv_pep508::{MarkerTree, RequirementOrigin, VerbatimUrl};
use uv_pypi_types::{ConflictingGroupList, Requirement, RequirementSource, SupportedEnvironments};
use uv_pypi_types::{Conflicts, Requirement, RequirementSource, SupportedEnvironments};
use uv_static::EnvVars;
use uv_warnings::{warn_user, warn_user_once};
@ -393,8 +393,8 @@ impl Workspace {
}
/// Returns the set of conflicts for the workspace.
pub fn conflicting_groups(&self) -> ConflictingGroupList {
let mut conflicting = ConflictingGroupList::empty();
pub fn conflicting_groups(&self) -> Conflicts {
let mut conflicting = Conflicts::empty();
for member in self.packages.values() {
conflicting.append(&mut member.pyproject_toml.conflicting_groups());
}