diff --git a/crates/distribution-types/src/resolution.rs b/crates/distribution-types/src/resolution.rs index b4f14df12..590ecd01f 100644 --- a/crates/distribution-types/src/resolution.rs +++ b/crates/distribution-types/src/resolution.rs @@ -66,7 +66,7 @@ impl From for Requirement { match dist { Dist::Built(BuiltDist::Registry(wheel)) => Requirement { name: wheel.filename.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::VersionSpecifier( pep440_rs::VersionSpecifiers::from( pep440_rs::VersionSpecifier::equals_version(wheel.filename.version), @@ -76,19 +76,19 @@ impl From for Requirement { }, Dist::Built(BuiltDist::DirectUrl(wheel)) => Requirement { name: wheel.filename.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::Url(wheel.url)), marker: None, }, Dist::Built(BuiltDist::Path(wheel)) => Requirement { name: wheel.filename.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::Url(wheel.url)), marker: None, }, Dist::Source(SourceDist::Registry(sdist)) => Requirement { name: sdist.filename.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::VersionSpecifier( pep440_rs::VersionSpecifiers::from( pep440_rs::VersionSpecifier::equals_version(sdist.filename.version), @@ -98,19 +98,19 @@ impl From for Requirement { }, Dist::Source(SourceDist::DirectUrl(sdist)) => Requirement { name: sdist.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::Url(sdist.url)), marker: None, }, Dist::Source(SourceDist::Git(sdist)) => Requirement { name: sdist.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::Url(sdist.url)), marker: None, }, Dist::Source(SourceDist::Path(sdist)) => Requirement { name: sdist.name, - extras: None, + extras: vec![], version_or_url: Some(pep508_rs::VersionOrUrl::Url(sdist.url)), marker: None, }, diff --git a/crates/pep508-rs/src/lib.rs b/crates/pep508-rs/src/lib.rs index 59ef56f99..8c8daebdf 100644 --- a/crates/pep508-rs/src/lib.rs +++ b/crates/pep508-rs/src/lib.rs @@ -131,7 +131,7 @@ pub struct Requirement { pub name: PackageName, /// The list of extras such as `security`, `tests` in /// `requests [security,tests] >= 2.8.1, == 2.8.* ; python_version > "3.8"` - pub extras: Option>, + pub extras: Vec, /// The version specifier such as `>= 2.8.1`, `== 2.8.*` in /// `requests [security,tests] >= 2.8.1, == 2.8.* ; python_version > "3.8"` /// or a url @@ -145,11 +145,11 @@ pub struct Requirement { impl Display for Requirement { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.name)?; - if let Some(extras) = &self.extras { + if !self.extras.is_empty() { write!( f, "[{}]", - extras + self.extras .iter() .map(ToString::to_string) .collect::>() @@ -214,10 +214,8 @@ impl Requirement { /// The list of extras such as `security`, `tests` in /// `requests [security,tests] >= 2.8.1, == 2.8.* ; python_version > "3.8"` #[getter] - pub fn extras(&self) -> Option> { - self.extras - .as_ref() - .map(|extras| extras.iter().map(ToString::to_string).collect()) + pub fn extras(&self) -> Vec { + self.extras.iter().map(ToString::to_string).collect() } /// The marker expression such as `python_version > "3.8"` in @@ -600,9 +598,9 @@ fn parse_name(cursor: &mut Cursor) -> Result { } /// parses extras in the `[extra1,extra2] format` -fn parse_extras(cursor: &mut Cursor) -> Result>, Pep508Error> { +fn parse_extras(cursor: &mut Cursor) -> Result, Pep508Error> { let Some(bracket_pos) = cursor.eat_char('[') else { - return Ok(None); + return Ok(vec![]); }; let mut extras = Vec::new(); @@ -689,7 +687,7 @@ fn parse_extras(cursor: &mut Cursor) -> Result>, Pep508Err } } - Ok(Some(extras)) + Ok(extras) } /// Parse a raw string for a URL requirement, which could be either a URL or a local path, and which @@ -1087,10 +1085,10 @@ mod tests { assert_eq!(input, requests.to_string()); let expected = Requirement { name: PackageName::from_str("requests").unwrap(), - extras: Some(vec![ + extras: vec![ ExtraName::from_str("security").unwrap(), ExtraName::from_str("tests").unwrap(), - ]), + ], version_or_url: Some(VersionOrUrl::VersionSpecifier( [ VersionSpecifier::new( @@ -1215,7 +1213,7 @@ mod tests { #[test] fn error_extras1() { let numpy = Requirement::from_str("black[d]").unwrap(); - assert_eq!(numpy.extras, Some(vec![ExtraName::from_str("d").unwrap()])); + assert_eq!(numpy.extras, vec![ExtraName::from_str("d").unwrap()]); } #[test] @@ -1223,10 +1221,10 @@ mod tests { let numpy = Requirement::from_str("black[d,jupyter]").unwrap(); assert_eq!( numpy.extras, - Some(vec![ + vec![ ExtraName::from_str("d").unwrap(), ExtraName::from_str("jupyter").unwrap(), - ]) + ] ); } @@ -1274,7 +1272,7 @@ mod tests { let url = "https://github.com/pypa/pip/archive/1.3.1.zip#sha1=da9234ee9982d4bbb3c72346a6de940a148ea686"; let expected = Requirement { name: PackageName::from_str("pip").unwrap(), - extras: None, + extras: vec![], marker: None, version_or_url: Some(VersionOrUrl::Url(VerbatimUrl::from_str(url).unwrap())), }; diff --git a/crates/puffin-installer/src/site_packages.rs b/crates/puffin-installer/src/site_packages.rs index 92a36f696..85dc4a40e 100644 --- a/crates/puffin-installer/src/site_packages.rs +++ b/crates/puffin-installer/src/site_packages.rs @@ -94,7 +94,7 @@ impl<'a> SitePackages<'a> { pub fn requirements(&self) -> impl Iterator + '_ { self.iter().map(|dist| Requirement { name: dist.name().clone(), - extras: None, + extras: vec![], version_or_url: Some(match dist.installed_version() { InstalledVersion::Version(version) => { pep508_rs::VersionOrUrl::VersionSpecifier(pep440_rs::VersionSpecifiers::from( diff --git a/crates/puffin-resolver/src/pubgrub/dependencies.rs b/crates/puffin-resolver/src/pubgrub/dependencies.rs index d53f05065..f54747d52 100644 --- a/crates/puffin-resolver/src/pubgrub/dependencies.rs +++ b/crates/puffin-resolver/src/pubgrub/dependencies.rs @@ -52,7 +52,6 @@ impl PubGrubDependencies { .extras .clone() .into_iter() - .flatten() .map(|extra| to_pubgrub(requirement, Some(extra))), ) { let (package, version) = result?; @@ -104,7 +103,6 @@ impl PubGrubDependencies { .extras .clone() .into_iter() - .flatten() .map(|extra| to_pubgrub(constraint, Some(extra))), ) { let (package, version) = result?; diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap index 959e0c161..3838a01e6 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -55,7 +55,7 @@ RequirementsTxt { name: PackageName( "python-dateutil", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -78,7 +78,7 @@ RequirementsTxt { name: PackageName( "pytz", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -101,7 +101,7 @@ RequirementsTxt { name: PackageName( "six", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -124,7 +124,7 @@ RequirementsTxt { name: PackageName( "tzdata", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap index 7e8059ac5..f79457fa5 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "django-debug-toolbar", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -33,7 +33,7 @@ RequirementsTxt { name: PackageName( "django", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -52,7 +52,7 @@ RequirementsTxt { name: PackageName( "pytz", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap index bf771095e..34b443a57 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "django", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "pytz", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-editable.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-editable.txt.snap index 7d2b440c9..fdaea6337 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-editable.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-editable.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -21,13 +21,11 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: Some( - [ - ExtraName( - "tabulate", - ), - ], - ), + extras: [ + ExtraName( + "tabulate", + ), + ], version_or_url: Some( Url( VerbatimUrl { diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap index bb4c6c0fc..73c7bda3b 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "inflection", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "upsidedown", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -55,7 +55,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -67,13 +67,11 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: Some( - [ - ExtraName( - "tabulate", - ), - ], - ), + extras: [ + ExtraName( + "tabulate", + ), + ], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap index af640aff5..8d96b6bb3 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "tomli", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -21,7 +21,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap index 53cb72342..97ff4e849 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "tomli", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap index 4e208f75f..4dc91a455 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "werkzeug", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -61,7 +61,7 @@ RequirementsTxt { name: PackageName( "urllib3", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -113,7 +113,7 @@ RequirementsTxt { name: PackageName( "ansicon", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -176,7 +176,7 @@ RequirementsTxt { name: PackageName( "requests-oauthlib", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -229,7 +229,7 @@ RequirementsTxt { name: PackageName( "psycopg2", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap index 2672a3784..b856a7dff 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "tqdm", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "tomli-w", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap index 7d2b440c9..fdaea6337 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -21,13 +21,11 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: Some( - [ - ExtraName( - "tabulate", - ), - ], - ), + extras: [ + ExtraName( + "tabulate", + ), + ], version_or_url: Some( Url( VerbatimUrl { diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap index 959e0c161..3838a01e6 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -55,7 +55,7 @@ RequirementsTxt { name: PackageName( "python-dateutil", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -78,7 +78,7 @@ RequirementsTxt { name: PackageName( "pytz", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -101,7 +101,7 @@ RequirementsTxt { name: PackageName( "six", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -124,7 +124,7 @@ RequirementsTxt { name: PackageName( "tzdata", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap index 7e8059ac5..f79457fa5 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "django-debug-toolbar", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -33,7 +33,7 @@ RequirementsTxt { name: PackageName( "django", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -52,7 +52,7 @@ RequirementsTxt { name: PackageName( "pytz", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap index bf771095e..34b443a57 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "django", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "pytz", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap index bb4c6c0fc..73c7bda3b 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "inflection", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "upsidedown", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -55,7 +55,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -67,13 +67,11 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: Some( - [ - ExtraName( - "tabulate", - ), - ], - ), + extras: [ + ExtraName( + "tabulate", + ), + ], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap index af640aff5..8d96b6bb3 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "tomli", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -21,7 +21,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap index 53cb72342..97ff4e849 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "tomli", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap index 4e208f75f..4dc91a455 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "werkzeug", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -61,7 +61,7 @@ RequirementsTxt { name: PackageName( "urllib3", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -113,7 +113,7 @@ RequirementsTxt { name: PackageName( "ansicon", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -176,7 +176,7 @@ RequirementsTxt { name: PackageName( "requests-oauthlib", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -229,7 +229,7 @@ RequirementsTxt { name: PackageName( "psycopg2", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap index 2672a3784..b856a7dff 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "tqdm", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( @@ -32,7 +32,7 @@ RequirementsTxt { name: PackageName( "tomli-w", ), - extras: None, + extras: [], version_or_url: Some( VersionSpecifier( VersionSpecifiers( diff --git a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap index 7d2b440c9..fdaea6337 100644 --- a/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap +++ b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap @@ -9,7 +9,7 @@ RequirementsTxt { name: PackageName( "numpy", ), - extras: None, + extras: [], version_or_url: None, marker: None, }, @@ -21,13 +21,11 @@ RequirementsTxt { name: PackageName( "pandas", ), - extras: Some( - [ - ExtraName( - "tabulate", - ), - ], - ), + extras: [ + ExtraName( + "tabulate", + ), + ], version_or_url: Some( Url( VerbatimUrl {