bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix invalid camel case suggestion involving unicode idents

Browse source 
Follow up to #77805.
This commit is contained in:
Esteban Küber 2021-01-29 11:07:14 -08:00
parent bf193d69fe
commit d10ee0d07e
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_lint/src/nonstandard_style.rs
View file

@ -57,7 +57,7 @@ declare_lint! {
declare_lint_pass!(NonCamelCaseTypes => [NON_CAMEL_CASE_TYPES]); declare_lint_pass!(NonCamelCaseTypes => [NON_CAMEL_CASE_TYPES]);
fn char_has_case(c: char) -> bool { fn char_has_case(c: char) -> bool {
c.is_lowercase() || c.is_uppercase() c.to_lowercase().to_string() != c.to_uppercase().to_string()
} }
fn is_camel_case(name: &str) -> bool { fn is_camel_case(name: &str) -> bool {
@ -138,6 +138,8 @@ impl NonCamelCaseTypes {
to_camel_case(name), to_camel_case(name),
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
} else {
err.span_label(ident.span, "should have an UpperCamelCase name");
} }
err.emit(); err.emit();
@ -299,6 +301,8 @@ impl NonSnakeCase {
} else { } else {
err.help(&format!("convert the identifier to snake case: `{}`", sc)); err.help(&format!("convert the identifier to snake case: `{}`", sc));
} }
} else {
err.span_label(ident.span, "should have a snake_case name");
} }
err.emit(); err.emit();
@ -477,6 +481,8 @@ impl NonUpperCaseGlobals {
uc, uc,
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
} else {
err.span_label(ident.span, "should have an UPPER_CASE name");
} }
err.emit(); err.emit();

8
src/test/ui/lint/special-upper-lower-cases.stderr
View file

@ -2,7 +2,7 @@ warning: type `𝕟𝕠𝕥𝕒𝕔𝕒𝕞𝕖𝕝` should have an upper camel
--> $DIR/special-upper-lower-cases.rs:11:8 --> $DIR/special-upper-lower-cases.rs:11:8
| |
LL | struct 𝕟𝕠𝕥𝕒𝕔𝕒𝕞𝕖𝕝; LL | struct 𝕟𝕠𝕥𝕒𝕔𝕒𝕞𝕖𝕝;
| ^^^^^^^^^ | ^^^^^^^^^ should have an UpperCamelCase name
| |
= note: `#[warn(non_camel_case_types)]` on by default = note: `#[warn(non_camel_case_types)]` on by default
@ -10,13 +10,13 @@ warning: type `𝕟𝕠𝕥_𝕒_𝕔𝕒𝕞𝕖𝕝` should have an upper came
--> $DIR/special-upper-lower-cases.rs:15:8 --> $DIR/special-upper-lower-cases.rs:15:8
| |
LL | struct 𝕟𝕠𝕥_𝕒_𝕔𝕒𝕞𝕖𝕝; LL | struct 𝕟𝕠𝕥_𝕒_𝕔𝕒𝕞𝕖𝕝;
| ^^^^^^^^^^^ help: convert the identifier to upper camel case: `𝕟𝕠𝕥𝕒𝕔𝕒𝕞𝕖𝕝` | ^^^^^^^^^^^ should have an UpperCamelCase name
warning: static variable `𝗻𝗼𝗻𝘂𝗽𝗽𝗲𝗿𝗰𝗮𝘀𝗲` should have an upper case name warning: static variable `𝗻𝗼𝗻𝘂𝗽𝗽𝗲𝗿𝗰𝗮𝘀𝗲` should have an upper case name
--> $DIR/special-upper-lower-cases.rs:18:8 --> $DIR/special-upper-lower-cases.rs:18:8
| |
LL | static 𝗻𝗼𝗻𝘂𝗽𝗽𝗲𝗿𝗰𝗮𝘀𝗲: i32 = 1; LL | static 𝗻𝗼𝗻𝘂𝗽𝗽𝗲𝗿𝗰𝗮𝘀𝗲: i32 = 1;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^ should have an UPPER_CASE name
| |
= note: `#[warn(non_upper_case_globals)]` on by default = note: `#[warn(non_upper_case_globals)]` on by default
@ -24,7 +24,7 @@ warning: variable `𝓢𝓝𝓐𝓐𝓐𝓐𝓚𝓔𝓢` should have a snake cas
--> $DIR/special-upper-lower-cases.rs:22:9 --> $DIR/special-upper-lower-cases.rs:22:9
| |
LL | let 𝓢𝓝𝓐𝓐𝓐𝓐𝓚𝓔𝓢 = 1; LL | let 𝓢𝓝𝓐𝓐𝓐𝓐𝓚𝓔𝓢 = 1;
| ^^^^^^^^^ | ^^^^^^^^^ should have a snake_case name
| |
= note: `#[warn(non_snake_case)]` on by default = note: `#[warn(non_snake_case)]` on by default