mirror of
https://github.com/astral-sh/uv.git
synced 2025-08-04 19:08:04 +00:00
Clippy pedantic (#1963)
Address a few pedantic lints lints are separated into separate commits so they can be reviewed individually. I've not added enforcement for any of these lints, but that could be added if desirable.
This commit is contained in:
danieleades
GitHub
parent
b052291685
commit
8d721830db
68 changed files with 635 additions and 673 deletions
|
|
@ -1122,7 +1122,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn basic_examples() {
|
||||
let input = r#"requests[security,tests] >=2.8.1, ==2.8.* ; python_version < '2.7'"#;
|
||||
let input = r"requests[security,tests] >=2.8.1, ==2.8.* ; python_version < '2.7'";
|
||||
let requests = Requirement::from_str(input).unwrap();
|
||||
assert_eq!(input, requests.to_string());
|
||||
let expected = Requirement {
|
||||
|
|
@ -1364,7 +1364,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_marker_incomplete1() {
|
||||
assert_err(
|
||||
r#"numpy; sys_platform"#,
|
||||
r"numpy; sys_platform",
|
||||
indoc! {"
|
||||
Expected a valid marker operator (such as '>=' or 'not in'), found ''
|
||||
numpy; sys_platform
|
||||
|
|
@ -1376,7 +1376,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_marker_incomplete2() {
|
||||
assert_err(
|
||||
r#"numpy; sys_platform =="#,
|
||||
r"numpy; sys_platform ==",
|
||||
indoc! {"\
|
||||
Expected marker value, found end of dependency specification
|
||||
numpy; sys_platform ==
|
||||
|
|
@ -1421,7 +1421,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_pep440() {
|
||||
assert_err(
|
||||
r#"numpy >=1.1.*"#,
|
||||
r"numpy >=1.1.*",
|
||||
indoc! {"
|
||||
Operator >= cannot be used with a wildcard version specifier
|
||||
numpy >=1.1.*
|
||||
|
|
@ -1433,7 +1433,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_no_name() {
|
||||
assert_err(
|
||||
r#"==0.0"#,
|
||||
r"==0.0",
|
||||
indoc! {"
|
||||
Expected package name starting with an alphanumeric character, found '='
|
||||
==0.0
|
||||
|
|
@ -1445,7 +1445,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_bare_url() {
|
||||
assert_err(
|
||||
r#"git+https://github.com/pallets/flask.git"#,
|
||||
r"git+https://github.com/pallets/flask.git",
|
||||
indoc! {"
|
||||
URL requirement must be preceded by a package name. Add the name of the package before the URL (e.g., `package_name @ https://...`).
|
||||
git+https://github.com/pallets/flask.git
|
||||
|
|
@ -1457,7 +1457,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_no_comma_between_extras() {
|
||||
assert_err(
|
||||
r#"name[bar baz]"#,
|
||||
r"name[bar baz]",
|
||||
indoc! {"
|
||||
Expected either ',' (separating extras) or ']' (ending the extras section), found 'b'
|
||||
name[bar baz]
|
||||
|
|
@ -1469,7 +1469,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_extra_comma_after_extras() {
|
||||
assert_err(
|
||||
r#"name[bar, baz,]"#,
|
||||
r"name[bar, baz,]",
|
||||
indoc! {"
|
||||
Expected an alphanumeric character starting the extra name, found ']'
|
||||
name[bar, baz,]
|
||||
|
|
@ -1481,7 +1481,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_extras_not_closed() {
|
||||
assert_err(
|
||||
r#"name[bar, baz >= 1.0"#,
|
||||
r"name[bar, baz >= 1.0",
|
||||
indoc! {"
|
||||
Expected either ',' (separating extras) or ']' (ending the extras section), found '>'
|
||||
name[bar, baz >= 1.0
|
||||
|
|
@ -1493,7 +1493,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_no_space_after_url() {
|
||||
assert_err(
|
||||
r#"name @ https://example.com/; extra == 'example'"#,
|
||||
r"name @ https://example.com/; extra == 'example'",
|
||||
indoc! {"
|
||||
Missing space before ';', the end of the URL is ambiguous
|
||||
name @ https://example.com/; extra == 'example'
|
||||
|
|
@ -1505,7 +1505,7 @@ mod tests {
|
|||
#[test]
|
||||
fn error_name_at_nothing() {
|
||||
assert_err(
|
||||
r#"name @"#,
|
||||
r"name @",
|
||||
indoc! {"
|
||||
Expected URL
|
||||
name @
|
||||
|
|
@ -1517,7 +1517,7 @@ mod tests {
|
|||
#[test]
|
||||
fn test_error_invalid_marker_key() {
|
||||
assert_err(
|
||||
r#"name; invalid_name"#,
|
||||
r"name; invalid_name",
|
||||
indoc! {"
|
||||
Expected a valid marker name, found 'invalid_name'
|
||||
name; invalid_name
|
||||
|
|
|
|||
|
|
@ -235,15 +235,15 @@ impl MarkerOperator {
|
|||
/// Compare two versions, returning None for `in` and `not in`
|
||||
fn to_pep440_operator(&self) -> Option<pep440_rs::Operator> {
|
||||
match self {
|
||||
MarkerOperator::Equal => Some(pep440_rs::Operator::Equal),
|
||||
MarkerOperator::NotEqual => Some(pep440_rs::Operator::NotEqual),
|
||||
MarkerOperator::GreaterThan => Some(pep440_rs::Operator::GreaterThan),
|
||||
MarkerOperator::GreaterEqual => Some(pep440_rs::Operator::GreaterThanEqual),
|
||||
MarkerOperator::LessThan => Some(pep440_rs::Operator::LessThan),
|
||||
MarkerOperator::LessEqual => Some(pep440_rs::Operator::LessThanEqual),
|
||||
MarkerOperator::TildeEqual => Some(pep440_rs::Operator::TildeEqual),
|
||||
MarkerOperator::In => None,
|
||||
MarkerOperator::NotIn => None,
|
||||
Self::Equal => Some(pep440_rs::Operator::Equal),
|
||||
Self::NotEqual => Some(pep440_rs::Operator::NotEqual),
|
||||
Self::GreaterThan => Some(pep440_rs::Operator::GreaterThan),
|
||||
Self::GreaterEqual => Some(pep440_rs::Operator::GreaterThanEqual),
|
||||
Self::LessThan => Some(pep440_rs::Operator::LessThan),
|
||||
Self::LessEqual => Some(pep440_rs::Operator::LessThanEqual),
|
||||
Self::TildeEqual => Some(pep440_rs::Operator::TildeEqual),
|
||||
Self::In => None,
|
||||
Self::NotIn => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -559,7 +559,7 @@ impl MarkerExpression {
|
|||
&self,
|
||||
env: &MarkerEnvironment,
|
||||
extras: &[ExtraName],
|
||||
reporter: &mut impl FnMut(MarkerWarningKind, String, &MarkerExpression),
|
||||
reporter: &mut impl FnMut(MarkerWarningKind, String, &Self),
|
||||
) -> bool {
|
||||
match &self.l_value {
|
||||
// The only sound choice for this is `<version key> <version op> <quoted PEP 440 version>`
|
||||
|
|
@ -830,7 +830,7 @@ impl MarkerExpression {
|
|||
&self,
|
||||
l_string: &str,
|
||||
r_string: &str,
|
||||
reporter: &mut impl FnMut(MarkerWarningKind, String, &MarkerExpression),
|
||||
reporter: &mut impl FnMut(MarkerWarningKind, String, &Self),
|
||||
) -> bool {
|
||||
match self.operator {
|
||||
MarkerOperator::Equal => l_string == r_string,
|
||||
|
|
@ -885,7 +885,7 @@ impl MarkerExpression {
|
|||
&self,
|
||||
value: &ExtraName,
|
||||
extras: &[ExtraName],
|
||||
reporter: &mut impl FnMut(MarkerWarningKind, String, &MarkerExpression),
|
||||
reporter: &mut impl FnMut(MarkerWarningKind, String, &Self),
|
||||
) -> bool {
|
||||
match self.operator {
|
||||
MarkerOperator::Equal => extras.contains(value),
|
||||
|
|
@ -957,11 +957,11 @@ impl MarkerTree {
|
|||
};
|
||||
self.report_deprecated_options(&mut reporter);
|
||||
match self {
|
||||
MarkerTree::Expression(expression) => expression.evaluate(env, extras, &mut reporter),
|
||||
MarkerTree::And(expressions) => expressions
|
||||
Self::Expression(expression) => expression.evaluate(env, extras, &mut reporter),
|
||||
Self::And(expressions) => expressions
|
||||
.iter()
|
||||
.all(|x| x.evaluate_reporter_impl(env, extras, &mut reporter)),
|
||||
MarkerTree::Or(expressions) => expressions
|
||||
Self::Or(expressions) => expressions
|
||||
.iter()
|
||||
.any(|x| x.evaluate_reporter_impl(env, extras, &mut reporter)),
|
||||
}
|
||||
|
|
@ -986,11 +986,11 @@ impl MarkerTree {
|
|||
reporter: &mut impl FnMut(MarkerWarningKind, String, &MarkerExpression),
|
||||
) -> bool {
|
||||
match self {
|
||||
MarkerTree::Expression(expression) => expression.evaluate(env, extras, reporter),
|
||||
MarkerTree::And(expressions) => expressions
|
||||
Self::Expression(expression) => expression.evaluate(env, extras, reporter),
|
||||
Self::And(expressions) => expressions
|
||||
.iter()
|
||||
.all(|x| x.evaluate_reporter_impl(env, extras, reporter)),
|
||||
MarkerTree::Or(expressions) => expressions
|
||||
Self::Or(expressions) => expressions
|
||||
.iter()
|
||||
.any(|x| x.evaluate_reporter_impl(env, extras, reporter)),
|
||||
}
|
||||
|
|
@ -1010,13 +1010,13 @@ impl MarkerTree {
|
|||
python_versions: &[Version],
|
||||
) -> bool {
|
||||
match self {
|
||||
MarkerTree::Expression(expression) => {
|
||||
Self::Expression(expression) => {
|
||||
expression.evaluate_extras_and_python_version(extras, python_versions)
|
||||
}
|
||||
MarkerTree::And(expressions) => expressions
|
||||
Self::And(expressions) => expressions
|
||||
.iter()
|
||||
.all(|x| x.evaluate_extras_and_python_version(extras, python_versions)),
|
||||
MarkerTree::Or(expressions) => expressions
|
||||
Self::Or(expressions) => expressions
|
||||
.iter()
|
||||
.any(|x| x.evaluate_extras_and_python_version(extras, python_versions)),
|
||||
}
|
||||
|
|
@ -1044,7 +1044,7 @@ impl MarkerTree {
|
|||
reporter: &mut impl FnMut(MarkerWarningKind, String, &MarkerExpression),
|
||||
) {
|
||||
match self {
|
||||
MarkerTree::Expression(expression) => {
|
||||
Self::Expression(expression) => {
|
||||
for value in [&expression.l_value, &expression.r_value] {
|
||||
match value {
|
||||
MarkerValue::MarkerEnvString(MarkerValueString::OsNameDeprecated) => {
|
||||
|
|
@ -1103,12 +1103,12 @@ impl MarkerTree {
|
|||
}
|
||||
}
|
||||
}
|
||||
MarkerTree::And(expressions) => {
|
||||
Self::And(expressions) => {
|
||||
for expression in expressions {
|
||||
expression.report_deprecated_options(reporter);
|
||||
}
|
||||
}
|
||||
MarkerTree::Or(expressions) => {
|
||||
Self::Or(expressions) => {
|
||||
for expression in expressions {
|
||||
expression.report_deprecated_options(reporter);
|
||||
}
|
||||
|
|
@ -1119,23 +1119,23 @@ impl MarkerTree {
|
|||
|
||||
impl Display for MarkerTree {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
let format_inner = |expression: &MarkerTree| {
|
||||
if matches!(expression, MarkerTree::Expression(_)) {
|
||||
let format_inner = |expression: &Self| {
|
||||
if matches!(expression, Self::Expression(_)) {
|
||||
format!("{expression}")
|
||||
} else {
|
||||
format!("({expression})")
|
||||
}
|
||||
};
|
||||
match self {
|
||||
MarkerTree::Expression(expression) => write!(f, "{expression}"),
|
||||
MarkerTree::And(and_list) => f.write_str(
|
||||
Self::Expression(expression) => write!(f, "{expression}"),
|
||||
Self::And(and_list) => f.write_str(
|
||||
&and_list
|
||||
.iter()
|
||||
.map(format_inner)
|
||||
.collect::<Vec<String>>()
|
||||
.join(" and "),
|
||||
),
|
||||
MarkerTree::Or(or_list) => f.write_str(
|
||||
Self::Or(or_list) => f.write_str(
|
||||
&or_list
|
||||
.iter()
|
||||
.map(format_inner)
|
||||
|
|
@ -1392,7 +1392,7 @@ mod test {
|
|||
#[test]
|
||||
fn test_marker_equivalence() {
|
||||
let values = [
|
||||
(r#"python_version == '2.7'"#, r#"python_version == "2.7""#),
|
||||
(r"python_version == '2.7'", r#"python_version == "2.7""#),
|
||||
(r#"python_version == "2.7""#, r#"python_version == "2.7""#),
|
||||
(
|
||||
r#"python_version == "2.7" and os_name == "posix""#,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue