Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `matches` rather than `contains` in `requirements.txt` parsing (#10423)

This commit is contained in:
Charlie Marsh 2025-01-08 21:32:09 -05:00 committed by GitHub
parent 58a81f7c47
commit 15ec830bea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/uv-requirements-txt/src/lib.rs
View File

@ -416,6 +416,11 @@ impl RequirementsTxt {
} }
} }
/// Returns `true` if the character is a newline or a comment character.
const fn is_terminal(c: char) -> bool {
matches!(c, '\n' | '\r' | '#')
}
/// Parse a single entry, that is a requirement, an inclusion or a comment line /// Parse a single entry, that is a requirement, an inclusion or a comment line
/// ///
/// Consumes all preceding trivia (whitespace and comments). If it returns None, we've reached /// Consumes all preceding trivia (whitespace and comments). If it returns None, we've reached
@ -436,7 +441,7 @@ fn parse_entry(
let start = s.cursor(); let start = s.cursor();
Ok(Some(if s.eat_if("-r") || s.eat_if("--requirement") { 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 requirements_file = parse_value(content, s, |c: char| !is_terminal(c))?;
let end = s.cursor(); let end = s.cursor();
RequirementsTxtStatement::Requirements { RequirementsTxtStatement::Requirements {
filename: requirements_file.to_string(), filename: requirements_file.to_string(),
@ -444,7 +449,7 @@ fn parse_entry(
end, end,
} }
} else if s.eat_if("-c") || s.eat_if("--constraint") { } else if s.eat_if("-c") || s.eat_if("--constraint") {
let constraints_file = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; let constraints_file = parse_value(content, s, |c: char| !is_terminal(c))?;
let end = s.cursor(); let end = s.cursor();
RequirementsTxtStatement::Constraint { RequirementsTxtStatement::Constraint {
filename: constraints_file.to_string(), filename: constraints_file.to_string(),
@ -475,7 +480,7 @@ fn parse_entry(
hashes, hashes,
}) })
} else if s.eat_if("-i") || s.eat_if("--index-url") { } else if s.eat_if("-i") || s.eat_if("--index-url") {
let given = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; let given = parse_value(content, s, |c: char| !is_terminal(c))?;
let expanded = expand_env_vars(given); let expanded = expand_env_vars(given);
let url = if let Some(path) = std::path::absolute(expanded.as_ref()) let url = if let Some(path) = std::path::absolute(expanded.as_ref())
.ok() .ok()
@ -501,7 +506,7 @@ fn parse_entry(
}; };
RequirementsTxtStatement::IndexUrl(url.with_given(given)) RequirementsTxtStatement::IndexUrl(url.with_given(given))
} else if s.eat_if("--extra-index-url") { } else if s.eat_if("--extra-index-url") {
let given = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; let given = parse_value(content, s, |c: char| !is_terminal(c))?;
let expanded = expand_env_vars(given); let expanded = expand_env_vars(given);
let url = if let Some(path) = std::path::absolute(expanded.as_ref()) let url = if let Some(path) = std::path::absolute(expanded.as_ref())
.ok() .ok()
@ -529,7 +534,7 @@ fn parse_entry(
} else if s.eat_if("--no-index") { } else if s.eat_if("--no-index") {
RequirementsTxtStatement::NoIndex RequirementsTxtStatement::NoIndex
} else if s.eat_if("--find-links") || s.eat_if("-f") { } else if s.eat_if("--find-links") || s.eat_if("-f") {
let given = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; let given = parse_value(content, s, |c: char| !is_terminal(c))?;
let expanded = expand_env_vars(given); let expanded = expand_env_vars(given);
let url = if let Some(path) = std::path::absolute(expanded.as_ref()) let url = if let Some(path) = std::path::absolute(expanded.as_ref())
.ok() .ok()
@ -555,7 +560,7 @@ fn parse_entry(
}; };
RequirementsTxtStatement::FindLinks(url.with_given(given)) RequirementsTxtStatement::FindLinks(url.with_given(given))
} else if s.eat_if("--no-binary") { } else if s.eat_if("--no-binary") {
let given = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; let given = parse_value(content, s, |c: char| !is_terminal(c))?;
let specifier = PackageNameSpecifier::from_str(given).map_err(|err| { let specifier = PackageNameSpecifier::from_str(given).map_err(|err| {
RequirementsTxtParserError::NoBinary { RequirementsTxtParserError::NoBinary {
source: err, source: err,
@ -566,7 +571,7 @@ fn parse_entry(
})?; })?;
RequirementsTxtStatement::NoBinary(NoBinary::from_pip_arg(specifier)) RequirementsTxtStatement::NoBinary(NoBinary::from_pip_arg(specifier))
} else if s.eat_if("--only-binary") { } else if s.eat_if("--only-binary") {
let given = parse_value(content, s, |c: char| !['\n', '\r', '#'].contains(&c))?; let given = parse_value(content, s, |c: char| !is_terminal(c))?;
let specifier = PackageNameSpecifier::from_str(given).map_err(|err| { let specifier = PackageNameSpecifier::from_str(given).map_err(|err| {
RequirementsTxtParserError::NoBinary { RequirementsTxtParserError::NoBinary {
source: err, source: err,