fix: bump rattler (#4953)

Author: baszalmstra

Cargo.lock

@@ -117,22 +117,22 @@ pypi_mapping = { path = "crates/pypi_mapping" }
 pypi_modifiers = { path = "crates/pypi_modifiers" }
 pyproject-toml = "0.13.7"
 rand = { version = "0.9.1", default-features = false }
-rattler = { version = "0.38.4", default-features = false }
-rattler_cache = { version = "0.4.1", default-features = false }
-rattler_conda_types = { version = "0.40.4", default-features = false, features = [
+rattler = { version = "0.39.1", default-features = false }
+rattler_cache = { version = "0.6.0", default-features = false }
+rattler_conda_types = { version = "0.41.1", default-features = false, features = [
   "rayon",
 ] }
-rattler_digest = { version = "1.1.7", default-features = false }
+rattler_digest = { version = "1.2.0", default-features = false }
 rattler_lock = { version = "0.26.1", default-features = false }
 rattler_menuinst = { version = "0.2.23", default-features = false }
 rattler_networking = { version = "0.25.21", default-features = false, features = [
   "dirs",
   "google-cloud-auth",
 ] }
 rattler_package_streaming = { version = "0.23.13", default-features = false }
-rattler_repodata_gateway = { version = "0.24.14", default-features = false }
+rattler_repodata_gateway = { version = "0.25.1", default-features = false }
 rattler_shell = { version = "0.25.7", default-features = false }
-rattler_solve = { version = "3.0.9", default-features = false }
+rattler_solve = { version = "3.1.1", default-features = false }
 rattler_virtual_packages = { version = "2.2.5", default-features = false }
 rayon = "1.10.0"
 regex = "1.11.1"

Cargo.toml

@@ -53,8 +53,12 @@ pub async fn search_exact<I: Interface>(
         miette::miette!("could not find package name in MatchSpec {}", match_spec)
     })?;
 
+    let package_name = package_name_search
+        .as_exact()
+        .ok_or_else(|| miette::miette!("search does not support wildcard package names"))?;
+
     let packages = search_package_by_filter(
-        &package_name_search,
+        package_name,
         all_package_names,
         repodata_query_func,
         |pn, n| pn == n,
@@ -63,7 +67,7 @@ pub async fn search_exact<I: Interface>(
     .await?;
 
     if packages.is_empty() {
-        let normalized_package_name = package_name_search.as_normalized();
+        let normalized_package_name = package_name.as_normalized();
         return Err(miette::miette!(
             "Package {normalized_package_name} not found, please use a wildcard '*' in the search name for a broader result."
         ));

crates/pixi_api/src/workspace/search/mod.rs

@@ -264,7 +264,7 @@ pub async fn create_exec_prefix(
             let guessed_package_name = specs[specs.len() - 1]
                 .name
                 .as_ref()
-                .map(|name| name.as_source())
+                .and_then(|name| name.as_exact().map(|n| n.as_source()))
                 .unwrap_or("<unknown>");
             tracing::debug!(
                 "Solver failed with guessed package '{}', retrying without it: {}",
@@ -335,7 +335,7 @@ fn list_exec_environment(
                 specs
                     .clone()
                     .into_iter()
-                    .filter_map(|spec| spec.name) // Extract the name if it exists
+                    .filter_map(|spec| spec.name.and_then(|n| n.as_exact().cloned())) // Extract exact name if it exists
                     .collect_vec()
                     .contains(&record.package_record.name),
             )
@@ -374,7 +374,11 @@ fn guess_package_spec(command: &str) -> MatchSpec {
     );
 
     MatchSpec {
-        name: Some(PackageName::from_str(&command).expect("all illegal characters were removed")),
+        name: Some(
+            PackageName::from_str(&command)
+                .expect("all illegal characters were removed")
+                .into(),
+        ),
         ..Default::default()
     }
 }

crates/pixi_cli/src/exec.rs

@@ -178,10 +178,14 @@ impl GlobalSpecs {
             self.specs
                 .iter()
                 .map(|spec_str| {
-                    MatchSpec::from_str(spec_str, ParseStrictness::Lenient)?
+                    let name = MatchSpec::from_str(spec_str, ParseStrictness::Lenient)?
                         .name
-                        .ok_or(GlobalSpecsConversionError::NameRequired)
-                        .map(|name| pixi_global::project::GlobalSpec::new(name, pixi_spec.clone()))
+                        .and_then(|matcher| matcher.as_exact().cloned())
+                        .ok_or(GlobalSpecsConversionError::NameRequired)?;
+                    Ok(pixi_global::project::GlobalSpec::new(
+                        name,
+                        pixi_spec.clone(),
+                    ))
                 })
                 .collect()
         } else {

crates/pixi_cli/src/global/global_specs.rs

@@ -279,9 +279,13 @@ async fn sync_exposed_names(
         .with
         .iter()
         .map(|spec| {
-            spec.name
-                .clone()
-                .ok_or_else(|| miette::miette!("could not find package name in MatchSpec {}", spec))
+            let name_matcher = spec.name.clone().ok_or_else(|| {
+                miette::miette!("could not find package name in MatchSpec {}", spec)
+            })?;
+            name_matcher
+                .as_exact()
+                .cloned()
+                .ok_or_else(|| miette::miette!("wildcard package names are not supported"))
         })
         .collect::<miette::Result<Vec<_>>>()?;
     let expose_type = if args.expose.is_empty().not() {

crates/pixi_cli/src/global/install.rs

@@ -62,7 +62,12 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         // Remove specs from the manifest
         let mut removed_dependencies = vec![];
         for spec in specs {
-            let package_name = spec.name.as_ref().expect("package name should be present");
+            let package_name = spec
+                .name
+                .as_ref()
+                .expect("package name should be present")
+                .as_exact()
+                .expect("package name must be exact");
             project
                 .manifest
                 .remove_dependency(env_name, package_name)
@@ -73,9 +78,10 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         let prefix = project.environment_prefix(env_name).await?;
 
         for spec in specs {
-            if let Some(name) = spec.clone().name {
+            if let Some(name_matcher) = spec.clone().name {
+                let name = name_matcher.as_exact().expect("package name must be exact");
                 // If the package is not existent, don't try to remove executables
-                if let Ok(record) = prefix.find_designated_package(&name).await {
+                if let Ok(record) = prefix.find_designated_package(name).await {
                     prefix
                         .find_executables(&[record])
                         .into_iter()

crates/pixi_cli/src/global/remove.rs

@@ -16,9 +16,13 @@ pub(crate) trait HasSpecs {
             .map(|package| {
                 let spec =
                     MatchSpec::from_str(package, ParseStrictness::Lenient).into_diagnostic()?;
-                let name = spec.name.clone().ok_or_else(|| {
+                let name_matcher = spec.name.clone().ok_or_else(|| {
                     miette::miette!("could not find package name in MatchSpec {}", spec)
                 })?;
+                let name = name_matcher
+                    .as_exact()
+                    .cloned()
+                    .ok_or_else(|| miette::miette!("wildcard package names are not supported"))?;
                 Ok((name, spec))
             })
             .collect()

crates/pixi_cli/src/has_specs.rs

@@ -33,7 +33,8 @@ impl MatchSpecOrPath {
             Self::MatchSpec(spec) => spec
                 .name
                 .as_ref()
-                .map(|name| name.as_normalized().to_string()),
+                .and_then(|name| name.as_exact())
+                .map(|n| n.as_normalized().to_string()),
             Self::Path(path_spec) => path_spec
                 .path
                 .file_name()
@@ -72,7 +73,7 @@ impl FromStr for MatchSpecOrPath {
                     .map_err(|e| format!("invalid package name: {e}"))?;
 
                 return Ok(Self::MatchSpec(Box::new(MatchSpec {
-                    name: Some(name),
+                    name: Some(name.into()),
                     url: Some(url),
                     ..MatchSpec::default()
                 })));
@@ -163,7 +164,7 @@ fn path_spec_to_match_spec(path_spec: PathSpec) -> Result<MatchSpec, String> {
         PackageName::try_from(archive.name).map_err(|e| format!("invalid package name: {e}"))?;
 
     Ok(MatchSpec {
-        name: Some(name),
+        name: Some(name.into()),
         url: Some(url),
         ..MatchSpec::default()
     })
@@ -193,7 +194,10 @@ mod tests {
         match spec_or_path {
             MatchSpecOrPath::MatchSpec(spec) => {
                 assert_eq!(
-                    spec.name.as_ref().map(|n| n.as_normalized()),
+                    spec.name
+                        .as_ref()
+                        .and_then(|n| n.as_exact())
+                        .map(|e| e.as_normalized()),
                     Some("tzdata")
                 );
                 assert!(spec.url.is_some());
@@ -210,7 +214,10 @@ mod tests {
         match spec_or_path {
             MatchSpecOrPath::MatchSpec(spec) => {
                 assert_eq!(
-                    spec.name.as_ref().map(|n| n.as_normalized()),
+                    spec.name
+                        .as_ref()
+                        .and_then(|n| n.as_exact())
+                        .map(|e| e.as_normalized()),
                     Some("test-package")
                 );
                 assert!(spec.url.is_some());

crates/pixi_cli/src/match_spec_or_path.rs

@@ -428,7 +428,7 @@ pub fn parse_specs_for_platform(
                 Some((
                     name.clone(),
                     (
-                        MatchSpec::from_nameless(nameless_match_spec, Some(name)),
+                        MatchSpec::from_nameless(nameless_match_spec, Some(name.clone().into())),
                         spec_type,
                     ),
                 ))