bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/diagnostics/decl_check/case_conv.rs')
-rw-r--r--crates/hir-ty/src/diagnostics/decl_check/case_conv.rs54
1 files changed, 4 insertions, 50 deletions
diff --git a/crates/hir-ty/src/diagnostics/decl_check/case_conv.rs b/crates/hir-ty/src/diagnostics/decl_check/case_conv.rs
index 2c13689620..cbe1af1570 100644
--- a/crates/hir-ty/src/diagnostics/decl_check/case_conv.rs
+++ b/crates/hir-ty/src/diagnostics/decl_check/case_conv.rs
@@ -11,50 +11,7 @@ pub(crate) fn to_camel_case(ident: &str) -> Option<String> {
return None;
}
- // Taken from rustc.
- let ret = ident
- .trim_matches('_')
- .split('_')
- .filter(|component| !component.is_empty())
- .map(|component| {
- let mut camel_cased_component = String::with_capacity(component.len());
-
- let mut new_word = true;
- let mut prev_is_lower_case = true;
-
- for c in component.chars() {
- // Preserve the case if an uppercase letter follows a lowercase letter, so that
- // `camelCase` is converted to `CamelCase`.
- if prev_is_lower_case && c.is_uppercase() {
- new_word = true;
- }
-
- if new_word {
- camel_cased_component.extend(c.to_uppercase());
- } else {
- camel_cased_component.extend(c.to_lowercase());
- }
-
- prev_is_lower_case = c.is_lowercase();
- new_word = false;
- }
-
- camel_cased_component
- })
- .fold((String::new(), None), |(acc, prev): (_, Option<String>), next| {
- // separate two components with an underscore if their boundary cannot
- // be distinguished using an uppercase/lowercase case distinction
- let join = prev
- .and_then(|prev| {
- let f = next.chars().next()?;
- let l = prev.chars().last()?;
- Some(!char_has_case(l) && !char_has_case(f))
- })
- .unwrap_or(false);
- (acc + if join { "_" } else { "" } + &next, Some(next))
- })
- .0;
- Some(ret)
+ Some(stdx::to_camel_case(ident))
}
/// Converts an identifier to a lower_snake_case form.
@@ -97,7 +54,9 @@ fn is_camel_case(name: &str) -> bool {
&& !name.chars().any(|snd| {
let ret = match fst {
None => false,
- Some(fst) => char_has_case(fst) && snd == '_' || char_has_case(snd) && fst == '_',
+ Some(fst) => {
+ stdx::char_has_case(fst) && snd == '_' || stdx::char_has_case(snd) && fst == '_'
+ }
};
fst = Some(snd);
@@ -135,11 +94,6 @@ fn is_snake_case<F: Fn(char) -> bool>(ident: &str, wrong_case: F) -> bool {
})
}
-// Taken from rustc.
-fn char_has_case(c: char) -> bool {
- c.is_lowercase() || c.is_uppercase()
-}
-
#[cfg(test)]
mod tests {
use super::*;