Skip to content

Commit 7d49571

Browse files
konstinkonstin
authored
Rename Dev to Group internally (#15557)
The "dev" naming is a pre-PEP 735 artifact.
1 parent 960714d commit 7d49571

File tree

15 files changed

+125
-113
lines changed

15 files changed

+125
-113
lines changed

‎crates/uv-distribution-types/src/resolution.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ pub enum ResolutionDiagnostic {
118118
/// The extra that was requested. For example, `colorama` in `black[colorama]`.
119119
extra: ExtraName,
120120
},
121-
MissingDev {
121+
MissingGroup {
122122
/// The distribution that was requested with a non-existent development dependency group.
123123
dist: ResolvedDist,
124124
/// The development dependency group that was requested.
125-
dev: GroupName,
125+
group: GroupName,
126126
},
127127
YankedVersion {
128128
/// The package that was requested with a yanked version. For example, `black==23.10.0`.
@@ -144,9 +144,9 @@ impl Diagnostic for ResolutionDiagnostic {
144144
Self::MissingExtra { dist, extra } => {
145145
format!("The package `{dist}` does not have an extra named `{extra}`")
146146
}
147-
Self::MissingDev { dist, dev } => {
147+
Self::MissingGroup { dist, group } => {
148148
format!(
149-
"The package `{dist}` does not have a development dependency group named `{dev}`"
149+
"The package `{dist}` does not have a development dependency group named `{group}`"
150150
)
151151
}
152152
Self::YankedVersion { dist, reason } => {
@@ -170,7 +170,7 @@ impl Diagnostic for ResolutionDiagnostic {
170170
fn includes(&self, name: &PackageName) -> bool {
171171
match self {
172172
Self::MissingExtra { dist, .. } => name == dist.name(),
173-
Self::MissingDev { dist, .. } => name == dist.name(),
173+
Self::MissingGroup { dist, .. } => name == dist.name(),
174174
Self::YankedVersion { dist, .. } => name == dist.name(),
175175
Self::MissingLowerBound { package_name } => name == package_name,
176176
}

‎crates/uv-resolver/src/error.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ fn collapse_no_versions_of_workspace_members(
775775
// Then, if the package is a workspace member...
776776
let (PubGrubPackageInner::Package { name, .. }
777777
| PubGrubPackageInner::Extra { name, .. }
778-
| PubGrubPackageInner::Dev { name, .. }) = &**package
778+
| PubGrubPackageInner::Group { name, .. }) = &**package
779779
else {
780780
return;
781781
};

‎crates/uv-resolver/src/lock/export/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl<'lock> ExportableRequirements<'lock> {
4646
target: &impl Installable<'lock>,
4747
prune: &[PackageName],
4848
extras: &ExtrasSpecificationWithDefaults,
49-
dev: &DependencyGroupsWithDefaults,
49+
groups: &DependencyGroupsWithDefaults,
5050
annotate: bool,
5151
install_options: &'lock InstallOptions,
5252
) -> Self {
@@ -76,7 +76,7 @@ impl<'lock> ExportableRequirements<'lock> {
7676
.expect("found too many packages matching root")
7777
.expect("could not find root");
7878

79-
if dev.prod() {
79+
if groups.prod() {
8080
// Add the workspace package to the graph.
8181
let index = *inverse
8282
.entry(&dist.id)
@@ -103,7 +103,7 @@ impl<'lock> ExportableRequirements<'lock> {
103103
.dependency_groups
104104
.iter()
105105
.filter_map(|(group, deps)| {
106-
if dev.contains(group) {
106+
if groups.contains(group) {
107107
Some(deps.iter().map(move |dep| (group, dep)))
108108
} else {
109109
None
@@ -163,7 +163,7 @@ impl<'lock> ExportableRequirements<'lock> {
163163
.dependency_groups()
164164
.iter()
165165
.filter_map(|(group, deps)| {
166-
if dev.contains(group) {
166+
if groups.contains(group) {
167167
Some(deps)
168168
} else {
169169
None

‎crates/uv-resolver/src/lock/installable.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub trait Installable<'lock> {
3838
marker_env: &ResolverMarkerEnvironment,
3939
tags: &Tags,
4040
extras: &ExtrasSpecificationWithDefaults,
41-
dev: &DependencyGroupsWithDefaults,
41+
groups: &DependencyGroupsWithDefaults,
4242
build_options: &BuildOptions,
4343
install_options: &InstallOptions,
4444
) -> Result<Resolution, LockError> {
@@ -74,7 +74,7 @@ pub trait Installable<'lock> {
7474
})?;
7575

7676
// Track the activated extras.
77-
if dev.prod() {
77+
if groups.prod() {
7878
activated_projects.push(&dist.id.name);
7979
for extra in extras.extra_names(dist.optional_dependencies.keys()) {
8080
activated_extras.push((&dist.id.name, extra));
@@ -85,7 +85,7 @@ pub trait Installable<'lock> {
8585
for group in dist
8686
.dependency_groups
8787
.keys()
88-
.filter(|group| dev.contains(group))
88+
.filter(|group| groups.contains(group))
8989
{
9090
activated_groups.push((&dist.id.name, group));
9191
}
@@ -106,7 +106,7 @@ pub trait Installable<'lock> {
106106
})?;
107107

108108
// Add the workspace package to the graph.
109-
let index = petgraph.add_node(if dev.prod() {
109+
let index = petgraph.add_node(if groups.prod() {
110110
self.package_to_node(dist, tags, build_options, install_options)?
111111
} else {
112112
self.non_installable_node(dist, tags)?
@@ -122,7 +122,7 @@ pub trait Installable<'lock> {
122122

123123
// Add the workspace dependencies to the queue.
124124
for (dist, index) in roots {
125-
if dev.prod() {
125+
if groups.prod() {
126126
// Push its dependencies onto the queue.
127127
queue.push_back((dist, None));
128128
for extra in extras.extra_names(dist.optional_dependencies.keys()) {
@@ -135,7 +135,7 @@ pub trait Installable<'lock> {
135135
.dependency_groups
136136
.iter()
137137
.filter_map(|(group, deps)| {
138-
if dev.contains(group) {
138+
if groups.contains(group) {
139139
Some(deps.iter().map(move |dep| (group, dep)))
140140
} else {
141141
None
@@ -172,7 +172,7 @@ pub trait Installable<'lock> {
172172
// referenced as a development dependency, then we need to re-enable it.
173173
let index = *entry.get();
174174
let node = &mut petgraph[index];
175-
if !dev.prod() {
175+
if !groups.prod() {
176176
*node = self.package_to_node(
177177
dep_dist,
178178
tags,
@@ -225,7 +225,7 @@ pub trait Installable<'lock> {
225225
})?;
226226

227227
// Add the package to the graph.
228-
let index = petgraph.add_node(if dev.prod() {
228+
let index = petgraph.add_node(if groups.prod() {
229229
self.package_to_node(dist, tags, build_options, install_options)?
230230
} else {
231231
self.non_installable_node(dist, tags)?
@@ -253,7 +253,7 @@ pub trait Installable<'lock> {
253253
.dependency_groups()
254254
.iter()
255255
.filter_map(|(group, deps)| {
256-
if dev.contains(group) {
256+
if groups.contains(group) {
257257
Some(deps.iter().map(move |dep| (group, dep)))
258258
} else {
259259
None
@@ -294,7 +294,7 @@ pub trait Installable<'lock> {
294294
// referenced as a development dependency, then we need to re-enable it.
295295
let index = *entry.get();
296296
let node = &mut petgraph[index];
297-
if !dev.prod() {
297+
if !groups.prod() {
298298
*node = self.package_to_node(dist, tags, build_options, install_options)?;
299299
}
300300
index

‎crates/uv-resolver/src/lock/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ impl Lock {
314314
)?;
315315
}
316316
}
317-
if let Some(group) = dist.dev.as_ref() {
317+
if let Some(group) = dist.group.as_ref() {
318318
let id = PackageId::from_annotated_dist(dist, root)?;
319319
let Some(package) = packages.get_mut(&id) else {
320320
return Err(LockErrorKind::MissingDevBase {

‎crates/uv-resolver/src/lock/tree.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<'env> TreeDisplay<'env> {
4141
depth: usize,
4242
prune: &[PackageName],
4343
packages: &[PackageName],
44-
dev: &DependencyGroupsWithDefaults,
44+
groups: &DependencyGroupsWithDefaults,
4545
no_dedupe: bool,
4646
invert: bool,
4747
) -> Self {
@@ -95,7 +95,7 @@ impl<'env> TreeDisplay<'env> {
9595
// Add an edge from the root.
9696
graph.add_edge(root, index, Edge::Prod(None));
9797

98-
if dev.prod() {
98+
if groups.prod() {
9999
// Push its dependencies on the queue.
100100
if seen.insert((id, None)) {
101101
queue.push_back((id, None));
@@ -114,7 +114,7 @@ impl<'env> TreeDisplay<'env> {
114114
.dependency_groups
115115
.iter()
116116
.filter_map(|(group, deps)| {
117-
if dev.contains(group) {
117+
if groups.contains(group) {
118118
Some(deps.iter().map(move |dep| (group, dep)))
119119
} else {
120120
None

‎crates/uv-resolver/src/pubgrub/dependencies.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ impl PubGrubDependency {
4444
pub(crate) fn from_requirement<'a>(
4545
conflicts: &Conflicts,
4646
requirement: Cow<'a, Requirement>,
47-
dev: Option<&'a GroupName>,
47+
group_name: Option<&'a GroupName>,
4848
parent_package: Option<&'a PubGrubPackage>,
4949
) -> impl Iterator<Item = Self> + 'a {
5050
let parent_name = parent_package.and_then(|package| package.name_no_root());
5151
let is_normal_parent = parent_package
52-
.map(|pp| pp.extra().is_none() && pp.dev().is_none())
52+
.map(|pp| pp.extra().is_none() && pp.group().is_none())
5353
.unwrap_or(false);
5454
let iter = if !requirement.extras.is_empty() {
5555
// This is crazy subtle, but if any of the extras in the
@@ -128,7 +128,7 @@ impl PubGrubDependency {
128128
url,
129129
},
130130
PubGrubPackageInner::Extra { name, .. } => {
131-
if dev.is_none() {
131+
if group_name.is_none() {
132132
debug_assert!(
133133
parent_name.is_none_or(|parent_name| parent_name != name),
134134
"extras not flattened for {name}"
@@ -141,8 +141,8 @@ impl PubGrubDependency {
141141
url,
142142
}
143143
}
144-
PubGrubPackageInner::Dev { name, .. } => {
145-
if dev.is_none() {
144+
PubGrubPackageInner::Group { name, .. } => {
145+
if group_name.is_none() {
146146
debug_assert!(
147147
parent_name.is_none_or(|parent_name| parent_name != name),
148148
"group not flattened for {name}"

0 commit comments

Comments
 (0)