Unnamed repository; edit this file 'description' to name the repository.
move is_upper_snake_case to stdx
davidsemakula 2024-01-16
parent 5b2a2bc · commit 1f91c48
-rw-r--r--crates/ide-db/src/imports/merge_imports.rs4
-rw-r--r--crates/stdx/src/lib.rs4
2 files changed, 5 insertions, 3 deletions
diff --git a/crates/ide-db/src/imports/merge_imports.rs b/crates/ide-db/src/imports/merge_imports.rs
index 2aa26c2703..740c50f79f 100644
--- a/crates/ide-db/src/imports/merge_imports.rs
+++ b/crates/ide-db/src/imports/merge_imports.rs
@@ -4,6 +4,7 @@ use std::iter::empty;
use itertools::{EitherOrBoth, Itertools};
use parser::T;
+use stdx::is_upper_snake_case;
use syntax::{
algo,
ast::{self, make, AstNode, HasAttrs, HasName, HasVisibility, PathSegmentKind},
@@ -340,9 +341,6 @@ fn path_segment_cmp(a: &ast::PathSegment, b: &ast::PathSegment) -> Ordering {
// snake_case < CamelCase < UPPER_SNAKE_CASE
let a_text = a_name.as_str();
let b_text = b_name.as_str();
- fn is_upper_snake_case(s: &str) -> bool {
- s.chars().all(|c| c.is_uppercase() || c == '_' || c.is_numeric())
- }
if a_text.starts_with(char::is_lowercase)
&& b_text.starts_with(char::is_uppercase)
{
diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
index 43909fff02..cd5285295a 100644
--- a/crates/stdx/src/lib.rs
+++ b/crates/stdx/src/lib.rs
@@ -171,6 +171,10 @@ pub fn char_has_case(c: char) -> bool {
c.is_lowercase() || c.is_uppercase()
}
+pub fn is_upper_snake_case(s: &str) -> bool {
+ s.chars().all(|c| c.is_uppercase() || c == '_' || c.is_numeric())
+}
+
pub fn replace(buf: &mut String, from: char, to: &str) {
if !buf.contains(from) {
return;