Rename to metadata-overrides

astral-sh · Sep 16, 2024 · a9ef2ad · a9ef2ad
1 parent 009a161
commit a9ef2ad
Show file tree

Hide file tree

Showing 34 changed files with 284 additions and 214 deletions.
diff --git a/crates/bench/benches/uv.rs b/crates/bench/benches/uv.rs
@@ -83,7 +83,7 @@ mod resolver {
 
     use anyhow::Result;
 
-    use distribution_types::{IndexCapabilities, IndexLocations, StaticMetadata};
+    use distribution_types::{IndexCapabilities, IndexLocations, MetadataOverrides};
     use install_wheel_rs::linker::LinkMode;
     use pep440_rs::Version;
     use pep508_rs::{MarkerEnvironment, MarkerEnvironmentBuilder};
@@ -161,7 +161,7 @@ mod resolver {
         let installed_packages = EmptyInstalledPackages;
         let options = OptionsBuilder::new().exclude_newer(exclude_newer).build();
         let sources = SourceStrategy::default();
-        let static_metadata = StaticMetadata::default();
+        let metadata_override = MetadataOverrides::default();
 
         let python_requirement = if universal {
             PythonRequirement::from_requires_python(
@@ -179,7 +179,7 @@ mod resolver {
             interpreter,
             &index_locations,
             &flat_index,
-            &static_metadata,
+            &metadata_override,
             &index,
             &git,
             &capabilities,

diff --git a/crates/distribution-types/src/lib.rs b/crates/distribution-types/src/lib.rs
@@ -58,11 +58,11 @@ pub use crate::hash::*;
 pub use crate::id::*;
 pub use crate::index_url::*;
 pub use crate::installed::*;
+pub use crate::metadata_override::*;
 pub use crate::prioritized_distribution::*;
 pub use crate::resolution::*;
 pub use crate::resolved::*;
 pub use crate::specified_requirement::*;
-pub use crate::static_metadata::*;
 pub use crate::traits::*;
 
 mod annotation;
@@ -76,11 +76,11 @@ mod hash;
 mod id;
 mod index_url;
 mod installed;
+mod metadata_override;
 mod prioritized_distribution;
 mod resolution;
 mod resolved;
 mod specified_requirement;
-mod static_metadata;
 mod traits;
 
 #[derive(Debug, Clone)]

diff --git a/...distribution-types/src/static_metadata.rs → ...stribution-types/src/metadata_override.rs b/...distribution-types/src/static_metadata.rs → ...stribution-types/src/metadata_override.rs
@@ -5,9 +5,9 @@ use uv_normalize::PackageName;
 
 /// Pre-defined [`Metadata23`] entries, indexed by [`PackageName`] and [`Version`].
 #[derive(Debug, Clone, Default)]
-pub struct StaticMetadata(FxHashMap<PackageName, FxHashMap<Version, Metadata23>>);
+pub struct MetadataOverrides(FxHashMap<PackageName, FxHashMap<Version, Metadata23>>);
 
-impl StaticMetadata {
+impl MetadataOverrides {
     /// Index a set of [`Metadata23`] entries by [`PackageName`] and [`Version`].
     pub fn from_entries(entries: impl IntoIterator<Item = Metadata23>) -> Self {
         let mut map = Self::default();

diff --git a/crates/uv-cli/src/options.rs b/crates/uv-cli/src/options.rs
@@ -271,7 +271,7 @@ pub fn resolver_options(
         } else {
             prerelease
         },
-        static_metadata: None,
+        metadata_override: None,
         config_settings: config_setting
             .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
         no_build_isolation: flag(no_build_isolation, build_isolation),
@@ -365,7 +365,7 @@ pub fn resolver_installer_options(
         } else {
             prerelease
         },
-        static_metadata: None,
+        metadata_override: None,
         config_settings: config_setting
             .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
         no_build_isolation: flag(no_build_isolation, build_isolation),

diff --git a/crates/uv-dispatch/src/lib.rs b/crates/uv-dispatch/src/lib.rs
@@ -12,7 +12,7 @@ use rustc_hash::FxHashMap;
 use tracing::{debug, instrument};
 
 use distribution_types::{
-    CachedDist, IndexCapabilities, IndexLocations, Name, Resolution, SourceDist, StaticMetadata,
+    CachedDist, IndexCapabilities, IndexLocations, MetadataOverrides, Name, Resolution, SourceDist,
     VersionOrUrlRef,
 };
 use pypi_types::Requirement;
@@ -46,7 +46,7 @@ pub struct BuildDispatch<'a> {
     index: &'a InMemoryIndex,
     git: &'a GitResolver,
     capabilities: &'a IndexCapabilities,
-    static_metadata: &'a StaticMetadata,
+    metadata_override: &'a MetadataOverrides,
     in_flight: &'a InFlight,
     build_isolation: BuildIsolation<'a>,
     link_mode: install_wheel_rs::linker::LinkMode,
@@ -68,7 +68,7 @@ impl<'a> BuildDispatch<'a> {
         interpreter: &'a Interpreter,
         index_locations: &'a IndexLocations,
         flat_index: &'a FlatIndex,
-        static_metadata: &'a StaticMetadata,
+        metadata_override: &'a MetadataOverrides,
         index: &'a InMemoryIndex,
         git: &'a GitResolver,
         capabilities: &'a IndexCapabilities,
@@ -93,7 +93,7 @@ impl<'a> BuildDispatch<'a> {
             index,
             git,
             capabilities,
-            static_metadata,
+            metadata_override,
             in_flight,
             index_strategy,
             config_settings,
@@ -140,8 +140,8 @@ impl<'a> BuildContext for BuildDispatch<'a> {
         self.capabilities
     }
 
-    fn static_metadata(&self) -> &StaticMetadata {
-        self.static_metadata
+    fn metadata_override(&self) -> &MetadataOverrides {
+        self.metadata_override
     }
 
     fn build_options(&self) -> &BuildOptions {

diff --git a/crates/uv-distribution/src/distribution_database.rs b/crates/uv-distribution/src/distribution_database.rs
@@ -363,7 +363,7 @@ impl<'a, Context: BuildContext> DistributionDatabase<'a, Context> {
         // If the metadata was provided by the user directly, prefer it.
         if let Some(metadata) = self
             .build_context
-            .static_metadata()
+            .metadata_override()
             .get(dist.name(), dist.version())
         {
             return Ok(ArchiveMetadata::from_metadata23(metadata.clone()));
@@ -429,7 +429,7 @@ impl<'a, Context: BuildContext> DistributionDatabase<'a, Context> {
             if let Some(version) = dist.version() {
                 if let Some(metadata) = self
                     .build_context
-                    .static_metadata()
+                    .metadata_override()
                     .get(dist.name(), version)
                 {
                     return Ok(ArchiveMetadata::from_metadata23(metadata.clone()));

diff --git a/crates/uv-resolver/src/lock/mod.rs b/crates/uv-resolver/src/lock/mod.rs
@@ -19,9 +19,9 @@ use distribution_filename::{DistExtension, ExtensionError, SourceDistExtension,
 use distribution_types::{
     BuiltDist, DirectUrlBuiltDist, DirectUrlSourceDist, DirectorySourceDist, Dist,
     DistributionMetadata, FileLocation, FlatIndexLocation, GitSourceDist, HashPolicy,
-    IndexLocations, IndexUrl, Name, PathBuiltDist, PathSourceDist, RegistryBuiltDist,
-    RegistryBuiltWheel, RegistrySourceDist, RemoteSource, Resolution, ResolvedDist, StaticMetadata,
-    ToUrlError, UrlString,
+    IndexLocations, IndexUrl, MetadataOverrides, Name, PathBuiltDist, PathSourceDist,
+    RegistryBuiltDist, RegistryBuiltWheel, RegistrySourceDist, RemoteSource, Resolution,
+    ResolvedDist, ToUrlError, UrlString,
 };
 use pep440_rs::Version;
 use pep508_rs::{split_scheme, MarkerEnvironment, MarkerTree, VerbatimUrl, VerbatimUrlError};
@@ -795,9 +795,9 @@ impl Lock {
                 manifest_table.insert("overrides", value(overrides));
             }
 
-            if !self.manifest.static_metadata.is_empty() {
+            if !self.manifest.metadata_override.is_empty() {
                 let mut tables = ArrayOfTables::new();
-                for metadata in &self.manifest.static_metadata {
+                for metadata in &self.manifest.metadata_override {
                     let mut table = Table::new();
                     table.insert("name", value(metadata.name.to_string()));
                     table.insert("version", value(metadata.version.to_string()));
@@ -824,7 +824,7 @@ impl Lock {
                     }
                     tables.push(table);
                 }
-                manifest_table.insert("static-metadata", Item::ArrayOfTables(tables));
+                manifest_table.insert("metadata-override", Item::ArrayOfTables(tables));
             }
 
             if !manifest_table.is_empty() {
@@ -913,7 +913,7 @@ impl Lock {
         requirements: &[Requirement],
         constraints: &[Requirement],
         overrides: &[Requirement],
-        static_metadata: &StaticMetadata,
+        metadata_override: &MetadataOverrides,
         indexes: Option<&IndexLocations>,
         build_options: &BuildOptions,
         tags: &Tags,
@@ -1030,8 +1030,8 @@ impl Lock {
 
         // Validate that the lockfile was generated with the same static metadata.
         {
-            let expected = static_metadata.values().cloned().collect::<BTreeSet<_>>();
-            let actual = &self.manifest.static_metadata;
+            let expected = metadata_override.values().cloned().collect::<BTreeSet<_>>();
+            let actual = &self.manifest.metadata_override;
             if expected != *actual {
                 return Ok(SatisfiesResult::MismatchedStaticMetadata(expected, actual));
             }
@@ -1348,7 +1348,7 @@ pub struct ResolverManifest {
     overrides: BTreeSet<Requirement>,
     /// The static metadata provided to the resolver.
     #[serde(default)]
-    static_metadata: BTreeSet<Metadata23>,
+    metadata_override: BTreeSet<Metadata23>,
 }
 
 impl ResolverManifest {
@@ -1359,14 +1359,14 @@ impl ResolverManifest {
         requirements: impl IntoIterator<Item = Requirement>,
         constraints: impl IntoIterator<Item = Requirement>,
         overrides: impl IntoIterator<Item = Requirement>,
-        static_metadata: impl IntoIterator<Item = Metadata23>,
+        metadata_override: impl IntoIterator<Item = Metadata23>,
     ) -> Self {
         Self {
             members: members.into_iter().collect(),
             requirements: requirements.into_iter().collect(),
             constraints: constraints.into_iter().collect(),
             overrides: overrides.into_iter().collect(),
-            static_metadata: static_metadata.into_iter().collect(),
+            metadata_override: metadata_override.into_iter().collect(),
         }
     }
 
@@ -1389,7 +1389,7 @@ impl ResolverManifest {
                 .into_iter()
                 .map(|requirement| requirement.relative_to(workspace.install_path()))
                 .collect::<Result<BTreeSet<_>, _>>()?,
-            static_metadata: self.static_metadata,
+            metadata_override: self.metadata_override,
         })
     }
 }

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap
@@ -105,7 +105,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap
@@ -112,7 +112,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap
@@ -104,7 +104,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/...r/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap b/...r/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap
@@ -176,7 +176,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/...ck/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap b/...ck/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap
@@ -176,7 +176,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/.../src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap b/.../src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap
@@ -176,7 +176,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/...es/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap b/...es/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap
@@ -85,7 +85,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_no_subdir.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_no_subdir.snap
@@ -81,7 +81,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_directory.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_directory.snap
@@ -71,7 +71,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )
diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_editable.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_editable.snap
@@ -71,7 +71,7 @@ Ok(
             requirements: {},
             constraints: {},
             overrides: {},
-            static_metadata: {},
+            metadata_override: {},
         },
     },
 )