Preserve simplified markers when reading locks

Author: charliermarsh

crates/uv-distribution-types/src/requires_python.rs

@@ -612,6 +612,11 @@ impl SimplifiedMarkerTree {
     pub fn as_simplified_marker_tree(self) -> MarkerTree {
         self.0
     }
+
+    /// Combine this simplified marker with another via a conjunction.
+    pub fn and(&mut self, marker: Self) {
+        self.0.and(marker.0);
+    }
 }
 
 #[cfg(test)]

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

@@ -2711,7 +2711,10 @@ impl TryFrom<LockWire> for Lock {
             .map(|simplified_marker| simplified_marker.into_marker(&wire.requires_python))
             .map(UniversalMarker::from_combined)
             .collect::<Vec<_>>();
-        let environment = fork_markers_union(&fork_markers, &wire.requires_python);
+        let environment = SimplifiedMarkerTree::new(
+            &wire.requires_python,
+            fork_markers_union(&fork_markers, &wire.requires_python),
+        );
         let packages = wire
             .packages
             .into_iter()
@@ -3804,7 +3807,7 @@ impl PackageWire {
     fn unwire(
         self,
         requires_python: &RequiresPython,
-        environment: MarkerTree,
+        environment: SimplifiedMarkerTree,
         unambiguous_package_ids: &FxHashMap<PackageName, PackageId>,
     ) -> Result<Package, LockError> {
         // Consistency check
@@ -5598,15 +5601,16 @@ impl DependencyWire {
     fn unwire(
         self,
         requires_python: &RequiresPython,
-        environment: MarkerTree,
+        environment: SimplifiedMarkerTree,
         unambiguous_package_ids: &FxHashMap<PackageName, PackageId>,
     ) -> Result<Dependency, LockError> {
-        let mut complexified_marker = self.marker.into_marker(requires_python);
-        complexified_marker.and(environment);
+        let mut simplified_marker = self.marker;
+        simplified_marker.and(environment);
+        let complexified_marker = simplified_marker.into_marker(requires_python);
         Ok(Dependency {
             package_id: self.package_id.unwire(unambiguous_package_ids)?,
             extra: self.extra,
-            simplified_marker: SimplifiedMarkerTree::new(requires_python, complexified_marker),
+            simplified_marker,
             complexified_marker: UniversalMarker::from_combined(complexified_marker),
         })
     }

crates/uv/tests/lock/lock.rs

@@ -32658,7 +32658,7 @@ fn windows_arm() -> Result<()> {
         version = "0.1.0"
         source = { virtual = "." }
         dependencies = [
-            { name = "pywin32", marker = "platform_machine == 'AMD64' and sys_platform == 'win32'" },
+            { name = "pywin32", marker = "sys_platform == 'win32'" },
         ]
 
         [package.metadata]