Skip to content

librustc: Don't ICE with type when name only contain underscores. #16704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2014
Merged

librustc: Don't ICE with type when name only contain underscores. #16704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
673c555
librustc: Don't ICE with type when name only contain underscores.
flugsio Aug 23, 2014
9eb9fcd
lint: Improve camel case suggestion when empty.
flugsio Aug 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/librustc/lint/builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ impl LintPass for NonCamelCaseTypes {

// start with a non-lowercase letter rather than non-uppercase
// ones (some scripts don't have a concept of upper/lowercase)
!ident.char_at(0).is_lowercase() && !ident.contains_char('_')
ident.len() > 0 && !ident.char_at(0).is_lowercase() && !ident.contains_char('_')
}

fn to_camel_case(s: &str) -> String {
Expand All @@ -768,9 +768,13 @@ impl LintPass for NonCamelCaseTypes {
let s = token::get_ident(ident);

if !is_camel_case(ident) {
cx.span_lint(NON_CAMEL_CASE_TYPES, span,
format!("{} `{}` should have a camel case name such as `{}`",
sort, s, to_camel_case(s.get())).as_slice());
let c = to_camel_case(s.get());
let m = if c.is_empty() {
format!("{} `{}` should have a camel case name such as `CamelCase`", sort, s)
} else {
format!("{} `{}` should have a camel case name such as `{}`", sort, s, c)
};
cx.span_lint(NON_CAMEL_CASE_TYPES, span, m.as_slice());
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/lint-non-camel-case-types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ struct foo7 {
bar: int,
}

type __ = int; //~ ERROR type `__` should have a camel case name such as `CamelCase`

fn main() { }