Skip to content

Commit 14ad456

Browse files
committed
error message nits
1 parent fbcfdad commit 14ad456

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

crates/ruff/tests/lint.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1986,7 +1986,7 @@ fn flake8_import_convention_invalid_aliases_config_alias_name() -> Result<()> {
19861986
.args(STDIN_BASE_OPTIONS)
19871987
.arg("--config")
19881988
.arg(&ruff_toml)
1989-
, @r#"
1989+
, @r###"
19901990
success: false
19911991
exit_code: 2
19921992
----- stdout -----
@@ -1998,8 +1998,8 @@ fn flake8_import_convention_invalid_aliases_config_alias_name() -> Result<()> {
19981998
|
19991999
2 | [lint.flake8-import-conventions.aliases]
20002000
| ^^^^
2001-
invalid value: string "invalid.alias", expected alias must be a valid identifier
2002-
"#);});
2001+
invalid value: string "invalid.alias", expected a Python identifier
2002+
"###);});
20032003
Ok(())
20042004
}
20052005

@@ -2022,7 +2022,7 @@ fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
20222022
.args(STDIN_BASE_OPTIONS)
20232023
.arg("--config")
20242024
.arg(&ruff_toml)
2025-
, @r#"
2025+
, @r###"
20262026
success: false
20272027
exit_code: 2
20282028
----- stdout -----
@@ -2034,7 +2034,7 @@ fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
20342034
|
20352035
2 | [lint.flake8-import-conventions.aliases]
20362036
| ^^^^
2037-
invalid value: string "module..invalid", expected module must be a valid identifier separated by single periods
2038-
"#);});
2037+
invalid value: string "module..invalid", expected a sequence of Python identifiers delimited by periods
2038+
"###);});
20392039
Ok(())
20402040
}

crates/ruff_workspace/src/options.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ impl<'de> Deserialize<'de> for ModuleName {
13911391
if name.is_empty() || name.split('.').any(|part| !is_identifier(part)) {
13921392
Err(de::Error::invalid_value(
13931393
de::Unexpected::Str(&name),
1394-
&"module must be a valid identifier separated by single periods",
1394+
&"a sequence of Python identifiers delimited by periods",
13951395
))
13961396
} else {
13971397
Ok(Self(name))
@@ -1420,7 +1420,7 @@ impl<'de> Deserialize<'de> for Alias {
14201420
} else {
14211421
Err(de::Error::invalid_value(
14221422
de::Unexpected::Str(&name),
1423-
&"alias must be a valid identifier",
1423+
&"a Python identifier",
14241424
))
14251425
}
14261426
}

0 commit comments

Comments
 (0)