mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-03 13:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace Option<BTreeSet> with BTreeSet for members (#10150)

Browse source
This commit is contained in:
Charlie Marsh 2024-12-24 19:37:46 -05:00 • committed by GitHub
parent f872b56124
commit facd21a679
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/uv-resolver/src/manifest.rs
View file

@ -57,7 +57,7 @@ impl Manifest {
overrides: Overrides, overrides: Overrides,
preferences: Preferences, preferences: Preferences,
project: Option<PackageName>, project: Option<PackageName>,
workspace_members: Option<BTreeSet<PackageName>>, workspace_members: BTreeSet<PackageName>,
exclusions: Exclusions, exclusions: Exclusions,
lookaheads: Vec<RequestedRequirements>, lookaheads: Vec<RequestedRequirements>,
) -> Self { ) -> Self {
@ -67,7 +67,7 @@ impl Manifest {
overrides, overrides,
preferences, preferences,
project, project,
workspace_members: workspace_members.unwrap_or_default(), workspace_members,
exclusions, exclusions,
lookaheads, lookaheads,
} }

3
crates/uv/src/commands/pip/compile.rs
View file

@ -1,3 +1,4 @@
use std::collections::BTreeSet;
use std::env; use std::env;
use std::path::Path; use std::path::Path;
@ -376,7 +377,7 @@ pub(crate) async fn pip_compile(
overrides, overrides,
source_trees, source_trees,
project, project,
None, BTreeSet::default(),
&extras, &extras,
preferences, preferences,
EmptyInstalledPackages, EmptyInstalledPackages,

3
crates/uv/src/commands/pip/install.rs
View file

@ -1,3 +1,4 @@
use std::collections::BTreeSet;
use std::fmt::Write; use std::fmt::Write;
use itertools::Itertools; use itertools::Itertools;
@ -403,7 +404,7 @@ pub(crate) async fn pip_install(
overrides, overrides,
source_trees, source_trees,
project, project,
None, BTreeSet::default(),
extras, extras,
preferences, preferences,
site_packages.clone(), site_packages.clone(),

2
crates/uv/src/commands/pip/operations.rs
View file

@ -93,7 +93,7 @@ pub(crate) async fn resolve<InstalledPackages: InstalledPackagesProvider>(
overrides: Vec<UnresolvedRequirementSpecification>, overrides: Vec<UnresolvedRequirementSpecification>,
source_trees: Vec<PathBuf>, source_trees: Vec<PathBuf>,
mut project: Option<PackageName>, mut project: Option<PackageName>,
workspace_members: Option<BTreeSet<PackageName>>, workspace_members: BTreeSet<PackageName>,
extras: &ExtrasSpecification, extras: &ExtrasSpecification,
preferences: Vec<Preference>, preferences: Vec<Preference>,
installed_packages: InstalledPackages, installed_packages: InstalledPackages,

3
crates/uv/src/commands/pip/sync.rs
View file

@ -1,3 +1,4 @@
use std::collections::BTreeSet;
use std::fmt::Write; use std::fmt::Write;
use anyhow::Result; use anyhow::Result;
@ -348,7 +349,7 @@ pub(crate) async fn pip_sync(
overrides, overrides,
source_trees, source_trees,
project, project,
None, BTreeSet::default(),
&extras, &extras,
preferences, preferences,
site_packages.clone(), site_packages.clone(),

2
crates/uv/src/commands/project/lock.rs
View file

@ -652,7 +652,7 @@ async fn do_lock(
source_trees, source_trees,
// The root is always null in workspaces, it "depends on" the projects // The root is always null in workspaces, it "depends on" the projects
None, None,
Some(packages.keys().cloned().collect()), packages.keys().cloned().collect(),
&extras, &extras,
preferences, preferences,
EmptyInstalledPackages, EmptyInstalledPackages,

5
crates/uv/src/commands/project/mod.rs
View file

@ -1,3 +1,4 @@
use std::collections::BTreeSet;
use std::fmt::Write; use std::fmt::Write;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
@ -1259,7 +1260,7 @@ pub(crate) async fn resolve_environment<'a>(
overrides, overrides,
source_trees, source_trees,
project, project,
None, BTreeSet::default(),
&extras, &extras,
preferences, preferences,
EmptyInstalledPackages, EmptyInstalledPackages,
@ -1604,7 +1605,7 @@ pub(crate) async fn update_environment(
overrides, overrides,
source_trees, source_trees,
project, project,
None, BTreeSet::default(),
&extras, &extras,
preferences, preferences,
site_packages.clone(), site_packages.clone(),