refactor: lock-file v4

crates/async_http_range_reader/src/async_http_range_reader.rs

@@ -195,7 +195,7 @@ impl AsyncHttpRangeReader {
                 .get(reqwest::header::CONTENT_RANGE)
                 .ok_or(AsyncHttpRangeReaderError::ContentRangeMissing)?
                 .to_str()
-                .map_err(|_| AsyncHttpRangeReaderError::ContentRangeMissing)?,
+                .map_err(|_err| AsyncHttpRangeReaderError::ContentRangeMissing)?,
         );
         let (start, finish, complete_length) = match content_range {
             ContentRange::Bytes(ContentRangeBytes {
@@ -297,9 +297,9 @@ impl AsyncHttpRangeReader {
             .get(reqwest::header::CONTENT_LENGTH)
             .ok_or(AsyncHttpRangeReaderError::ContentLengthMissing)?
             .to_str()
-            .map_err(|_| AsyncHttpRangeReaderError::ContentLengthMissing)?
+            .map_err(|_err| AsyncHttpRangeReaderError::ContentLengthMissing)?
             .parse()
-            .map_err(|_| AsyncHttpRangeReaderError::ContentLengthMissing)?;
+            .map_err(|_err| AsyncHttpRangeReaderError::ContentLengthMissing)?;
 
         // Allocate a memory map to hold the data
         let memory_map = memmap2::MmapOptions::new()

crates/async_http_range_reader/src/sparse_range.rs

@@ -65,8 +65,7 @@ impl SparseRange {
         // Compute the bounds of covered range taking into account existing covered ranges.
         let start = left_slice
             .first()
-            .map(|&left_bound| left_bound.min(range_start))
-            .unwrap_or(range_start);
+            .map_or(range_start, |&left_bound| left_bound.min(range_start));
 
         // Get the ranges that are missing
         let mut bound = start;
@@ -79,8 +78,7 @@ impl SparseRange {
 
         let end = right_slice
             .last()
-            .map(|&right_bound| right_bound.max(range_end))
-            .unwrap_or(range_end);
+            .map_or(range_end, |&right_bound| right_bound.max(range_end));
 
         bound > end
     }
@@ -93,7 +91,7 @@ impl SparseRange {
     }
 
     /// Find the ranges that are uncovered for the specified range together with what the
-    /// SparseRange would look like if we covered that range.
+    /// [`SparseRange`] would look like if we covered that range.
     pub fn cover(&self, range: Range<u64>) -> Option<(SparseRange, Vec<RangeInclusive<u64>>)> {
         let range_start = range.start;
         let range_end = range.end - 1;
@@ -109,12 +107,10 @@ impl SparseRange {
         // Compute the bounds of covered range taking into account existing covered ranges.
         let start = left_slice
             .first()
-            .map(|&left_bound| left_bound.min(range_start))
-            .unwrap_or(range_start);
+            .map_or(range_start, |&left_bound| left_bound.min(range_start));
         let end = right_slice
             .last()
-            .map(|&right_bound| right_bound.max(range_end))
-            .unwrap_or(range_end);
+            .map_or(range_end, |&right_bound| right_bound.max(range_end));
 
         // Get the ranges that are missing
         let mut ranges = Vec::new();
@@ -126,10 +122,12 @@ impl SparseRange {
             bound = right_bound + 1;
         }
         if bound <= end {
-            ranges.push(bound..=end)
+            ranges.push(bound..=end);
         }
 
-        if !ranges.is_empty() {
+        if ranges.is_empty() {
+            None
+        } else {
             let mut new_left = self.left.clone();
             new_left.splice(left_index..right_index, [start]);
             let mut new_right = self.right.clone();
@@ -141,8 +139,6 @@ impl SparseRange {
                 },
                 ranges,
             ))
-        } else {
-            None
         }
     }
 }

crates/rattler/src/install/mod.rs

@@ -618,10 +618,9 @@ mod test {
         package_cache::PackageCache,
     };
     use futures::{stream, StreamExt};
-    use itertools::Itertools;
     use rattler_conda_types::package::ArchiveIdentifier;
     use rattler_conda_types::{ExplicitEnvironmentSpec, Platform, Version};
-    use rattler_lock::CondaLock;
+    use rattler_lock::LockFile;
     use rattler_networking::AuthenticatedClient;
 
     use std::env::temp_dir;
@@ -642,7 +641,7 @@ mod test {
         assert_eq!(env.platform, Some(current_platform), "the platform for which the explicit lock file was created does not match the current platform");
 
         test_install_python(
-            env.packages.iter().map(|p| &p.url),
+            env.packages.into_iter().map(|p| p.url),
             "explicit",
             current_platform,
         )
@@ -653,23 +652,28 @@ mod test {
     #[tokio::test]
     pub async fn test_conda_lock() {
         // Load a prepared explicit environment file for the current platform.
-        let lock_path = get_test_data_dir().join("conda-lock/python-conda-lock.yml");
-        let lock = CondaLock::from_path(&lock_path).unwrap();
+        let lock_path = get_test_data_dir().join("conda-lock/v4/python-lock.yml");
+        let lock = LockFile::from_path(&lock_path).unwrap();
 
         let current_platform = Platform::current();
-        assert!(lock.metadata.platforms.iter().contains(&current_platform), "the platform for which the explicit lock file was created does not match the current platform");
+        let lock_env = lock
+            .default_environment()
+            .expect("no default environment in lock file");
+
+        let Some(packages) = lock_env.packages(current_platform) else {
+            panic!("the platform for which the explicit lock file was created does not match the current platform")
+        };
 
         test_install_python(
-            lock.get_packages_by_platform(current_platform)
-                .filter_map(|p| Some(&p.as_conda()?.url)),
+            packages.filter_map(|p| Some(p.as_conda()?.url().clone())),
             "conda-lock",
             current_platform,
         )
         .await;
     }
 
     pub async fn test_install_python(
-        urls: impl Iterator<Item = &Url>,
+        urls: impl Iterator<Item = Url>,
         cache_name: &str,
         platform: Platform,
     ) {
@@ -697,7 +701,7 @@ mod test {
                 let python_version = &python_version;
                 async move {
                     // Populate the cache
-                    let package_info = ArchiveIdentifier::try_from_url(package_url).unwrap();
+                    let package_info = ArchiveIdentifier::try_from_url(&package_url).unwrap();
                     let package_dir = package_cache
                         .get_or_fetch_from_url(package_info, package_url.clone(), client.clone())
                         .await

crates/rattler_conda_types/src/repo_data/snapshots/rattler_conda_types__repo_data__test__deserialize_no_packages_conda.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/repo_data/mod.rs
-assertion_line: 477
 expression: repodata
 ---
 info:
@@ -182,3 +181,4 @@ packages:
     version: "2.1"
 packages.conda: {}
 repodata_version: 2
+

crates/rattler_conda_types/src/repo_data/snapshots/rattler_conda_types__repo_data__test__serialize_packages.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/repo_data/mod.rs
-assertion_line: 448
 expression: repodata
 ---
 info:

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__requests-2_28_2-pyhd8ed1ab_0_json.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/prefix_record.rs
-assertion_line: 266
 expression: prefix_record
 ---
 build: pyhd8ed1ab_0

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__urllib3-1_26_14-pyhd8ed1ab_0_json.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/prefix_record.rs
-assertion_line: 266
 expression: prefix_record
 ---
 build: pyhd8ed1ab_0

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__xz-5_2_6-h8d14728_0_json.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/prefix_record.rs
-assertion_line: 266
 expression: prefix_record
 ---
 arch: x86_64

crates/rattler_lock/Cargo.toml

@@ -14,6 +14,7 @@ readme.workspace = true
 chrono = "0.4.27"
 fxhash = "0.2.1"
 indexmap = { version = "2.0.0", features = ["serde"] }
+itertools = "0.12.0"
 rattler_conda_types = { version = "0.16.2", path = "../rattler_conda_types" }
 rattler_digest = { version = "0.16.2", path = "../rattler_digest" }
 pep508_rs = { version = "0.2.3", features = ["serde"] }
@@ -25,6 +26,9 @@ serde_yaml = "0.9.25"
 serde_with = { version = "3.3.0", features = ["indexmap_2"] }
 thiserror = "1.0.47"
 url = { version = "2.4.1", features = ["serde"] }
+purl = { version = "0.1.2", features = ["serde"] }
 
 [dev-dependencies]
 insta = { version = "1.31.0", features = ["yaml"] }
+similar-asserts = "1.5.0"
+rstest = "0.18.2"