squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

librustc: change check_item_non_camel_case_types to not copy

Browse source
This commit is contained in:
Erick Tryzelaar 2013-02-16 10:35:05 -08:00
parent 3c0eca7940
commit ae86c03af2
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/librustc/middle/lint.rs
View file

@ -834,26 +834,23 @@ fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
fn is_camel_case(cx: ty::ctxt, ident: ast::ident) -> bool {
let ident = cx.sess.str_of(ident);
assert !ident.is_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)) &&
!ident.contains_char('_')
}
fn ident_without_trailing_underscores(+ident: ~str) -> ~str {
fn ident_without_trailing_underscores(ident: &r/str) -> &r/str {
match str::rfind(ident, |c| c != '_') {
Some(idx) => (ident).slice(0, idx + 1),
None => { ident } // all underscores
Some(idx) => str::view(ident, 0, idx + 1),
None => ident, // all underscores
}
}
fn ident_without_leading_underscores(+ident: ~str) -> ~str {
fn ident_without_leading_underscores(ident: &r/str) -> &r/str {
match str::find(ident, |c| c != '_') {
Some(idx) => ident.slice(idx, ident.len()),
None => {
// all underscores
ident
}
Some(idx) => str::view(ident, idx, ident.len()),
None => ident // all underscores
}
}