fix compilation in main branch (#244)

conda · Jul 4, 2023 · aaf4ced · aaf4ced
1 parent 37e378c
commit aaf4ced
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/crates/libsolv_rs/src/conda_util.rs b/crates/libsolv_rs/src/conda_util.rs
@@ -133,10 +133,15 @@ pub(crate) fn find_highest_version(
 
     candidates.fold(None, |init, record| {
         Some(init.map_or_else(
-            || (record.version.clone(), !record.track_features.is_empty()),
+            || {
+                (
+                    record.version.version().clone(),
+                    !record.track_features.is_empty(),
+                )
+            },
             |(version, has_tracked_features)| {
                 (
-                    version.max(record.version.clone()),
+                    version.max(record.version.version().clone()),
                     has_tracked_features && record.track_features.is_empty(),
                 )
             },

diff --git a/crates/rattler_solve/src/libsolv_rs/input.rs b/crates/rattler_solve/src/libsolv_rs/input.rs
@@ -112,7 +112,7 @@ pub fn add_virtual_packages(pool: &mut Pool, repo_id: RepoId, packages: &[Generi
             subdir: "".to_string(),
             timestamp: None,
             build_number: 0,
-            version: p.version.clone(),
+            version: p.version.clone().into(),
             build: p.build_string.clone(),
             depends: Vec::new(),
             features: None,