Allow comments after all requirements.txt entries #3018
Merged
+195
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charliermarsh
commented
Apr 12, 2024
| @@ -801,9 +799,7 @@ fn parse_requirement_and_hashes( | |||
| })?; | |||
|
|
|||
| let hashes = if has_hashes { | |||
| let hashes = parse_hashes(content, s)?; | |||
| eat_trailing_line(content, s)?; | |||
There was a problem hiding this comment.
Not necessary, I think, because the next step after parsing an entry is to eat the trailing line.
charliermarsh
commented
Apr 12, 2024
| @@ -581,7 +581,6 @@ fn parse_entry( | |||
| Ok(Some(if s.eat_if("-r") || s.eat_if("--requirement") { | |||
| let requirements_file = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; | |||
| let end = s.cursor(); | |||
| eat_trailing_line(content, s)?; | |||
There was a problem hiding this comment.
Not necessary, I think, because the next step after parsing an entry is to eat the trailing line.
charliermarsh
commented
Apr 12, 2024
| @@ -590,19 +589,18 @@ fn parse_entry( | |||
| } else if s.eat_if("-c") || s.eat_if("--constraint") { | |||
| let constraints_file = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; | |||
| let end = s.cursor(); | |||
| eat_trailing_line(content, s)?; | |||
There was a problem hiding this comment.
Not necessary, I think, because the next step after parsing an entry is to eat the trailing line.
charliermarsh
force-pushed
the
charlie/comment
branch
from
9ebe565
to
9254dd5
Compare
zanieb
approved these changes
Apr 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
I'm surprised we haven't hit this before, but apparently we don't allow comments after
--index-url,-eentries, etc., in the requirements.txt parser.Closes #3011.
Test Plan
cargo test