rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

lint: Allow leading underscores on camel case types

Browse Source
This commit is contained in:
Brian Anderson
2012-08-15 14:54:33 -07:00
parent 74c69e1053
commit a83414b6e8
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/rustc/middle/lint.rs
View File

@@ -452,17 +452,28 @@ fn check_item_path_statement(cx: ty::ctxt, it: @ast::item) {
fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) { fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
fn is_camel_case(ident: ast::ident) -> bool { fn is_camel_case(ident: ast::ident) -> bool {
assert ident.is_not_empty(); assert ident.is_not_empty();
let ident = ident_without_trailing_underscores(ident); let ident = ident_without_trailing_underscores(*ident);
let ident = ident_without_leading_underscores(ident);
char::is_uppercase(str::char_at(ident, 0)) && char::is_uppercase(str::char_at(ident, 0)) &&
!ident.contains_char('_') !ident.contains_char('_')
} }
fn ident_without_trailing_underscores(ident: ast::ident) -> ~str { fn ident_without_trailing_underscores(ident: ~str) -> ~str {
match str::rfind(*ident, |c| c != '_') { match str::rfind(ident, |c| c != '_') {
some(idx) => (*ident).slice(0, idx + 1), some(idx) => ident.slice(0, idx + 1),
none => { none => {
// all underscores // all underscores
*ident ident
}
}
}
fn ident_without_leading_underscores(ident: ~str) -> ~str {
match str::find(ident, |c| c != '_') {
some(idx) => ident.slice(idx, ident.len()),
none => {
// all underscores
ident
} }
} }
} }