Annotate sources of requirements

crates/distribution-types/src/resolution.rs

@@ -83,19 +83,22 @@ impl From<Dist> for Requirement {
                     ),
                 )),
                 marker: None,
+                path: None,
             },
 
             Dist::Built(BuiltDist::DirectUrl(wheel)) => Self {
                 name: wheel.filename.name,
                 extras: vec![],
                 version_or_url: Some(pep508_rs::VersionOrUrl::Url(wheel.url)),
                 marker: None,
+                path: None,
             },
             Dist::Built(BuiltDist::Path(wheel)) => Self {
                 name: wheel.filename.name,
                 extras: vec![],
                 version_or_url: Some(pep508_rs::VersionOrUrl::Url(wheel.url)),
                 marker: None,
+                path: None,
             },
             Dist::Source(SourceDist::Registry(sdist)) => Self {
                 name: sdist.filename.name,
@@ -106,24 +109,28 @@ impl From<Dist> for Requirement {
                     ),
                 )),
                 marker: None,
+                path: None,
             },
             Dist::Source(SourceDist::DirectUrl(sdist)) => Self {
                 name: sdist.name,
                 extras: vec![],
                 version_or_url: Some(pep508_rs::VersionOrUrl::Url(sdist.url)),
                 marker: None,
+                path: None,
             },
             Dist::Source(SourceDist::Git(sdist)) => Self {
                 name: sdist.name,
                 extras: vec![],
                 version_or_url: Some(pep508_rs::VersionOrUrl::Url(sdist.url)),
                 marker: None,
+                path: None,
             },
             Dist::Source(SourceDist::Path(sdist)) => Self {
                 name: sdist.name,
                 extras: vec![],
                 version_or_url: Some(pep508_rs::VersionOrUrl::Url(sdist.url)),
                 marker: None,
+                path: None,
             },
         }
     }
@@ -140,6 +147,7 @@ impl From<InstalledDist> for Requirement {
                 )),
             )),
             marker: None,
+            path: None,
         }
     }
 }

crates/pep440-rs/src/lib.rs

@@ -37,6 +37,7 @@
 #[cfg(feature = "pyo3")]
 pub use version::PyVersion;
 pub use {
+    tracked_from_str::TrackedFromStr,
     version::{
         LocalSegment, Operator, OperatorParseError, PreRelease, PreReleaseKind, Version,
         VersionParseError, VersionPattern, VersionPatternParseError, MIN_VERSION,
@@ -47,6 +48,7 @@ pub use {
     },
 };
 
+mod tracked_from_str;
 mod version;
 mod version_specifier;
 

crates/pep440-rs/src/tracked_from_str.rs

@@ -0,0 +1,14 @@
+use std::path::Path;
+
+/// Like FromStr, but with information about where the str came from
+pub trait TrackedFromStr: Sized {
+    /// The associated error which can be returned from parsing.
+    type Err;
+
+    /// Convert from input with optional source and working_dir
+    fn tracked_from_str(
+        input: &str,
+        source: Option<&Path>,
+        working_dir: Option<&Path>,
+    ) -> Result<Self, Self::Err>;
+}

crates/pep440-rs/src/version_specifier.rs

@@ -1,6 +1,6 @@
 #[cfg(feature = "pyo3")]
 use std::hash::{Hash, Hasher};
-use std::{cmp::Ordering, str::FromStr};
+use std::{cmp::Ordering, path::Path, str::FromStr};
 
 #[cfg(feature = "pyo3")]
 use pyo3::{
@@ -15,7 +15,8 @@ use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 #[cfg(feature = "pyo3")]
 use crate::version::PyVersion;
 use crate::{
-    version, Operator, OperatorParseError, Version, VersionPattern, VersionPatternParseError,
+    tracked_from_str::TrackedFromStr, version, Operator, OperatorParseError, Version,
+    VersionPattern, VersionPatternParseError,
 };
 
 /// A thin wrapper around `Vec<VersionSpecifier>` with a serde implementation
@@ -66,11 +67,23 @@ impl FromIterator<VersionSpecifier> for VersionSpecifiers {
     }
 }
 
+impl TrackedFromStr for VersionSpecifiers {
+    type Err = VersionSpecifiersParseError;
+
+    fn tracked_from_str(
+        input: &str,
+        _source: Option<&Path>,
+        _working_dir: Option<&Path>,
+    ) -> Result<Self, Self::Err> {
+        parse_version_specifiers(input).map(Self)
+    }
+}
+
 impl FromStr for VersionSpecifiers {
     type Err = VersionSpecifiersParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        parse_version_specifiers(s).map(Self)
+        Self::tracked_from_str(s, None, None)
     }
 }