diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-18 13:46:54 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-18 13:46:54 +0000 |
commit | eab80cd961919b9321e1d34343ae3f3adb0502e5 (patch) | |
tree | 825fc70ee0abe5a15a9c55fd5f5a4b34b060f9c5 /crates/ra_ide_db | |
parent | e59445cdde30cb73bc72e2266032f5e0125e6805 (diff) | |
parent | 039f2039a4ec06c8e52734190ceaf43a21de5e39 (diff) |
Merge #3218
3218: Cut some deps r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_db')
-rw-r--r-- | crates/ra_ide_db/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_ide_db/src/symbol_index.rs | 20 |
2 files changed, 13 insertions, 8 deletions
diff --git a/crates/ra_ide_db/Cargo.toml b/crates/ra_ide_db/Cargo.toml index ad3acce59..dbe98f3a0 100644 --- a/crates/ra_ide_db/Cargo.toml +++ b/crates/ra_ide_db/Cargo.toml | |||
@@ -20,7 +20,6 @@ log = "0.4.5" | |||
20 | rayon = "1.0.2" | 20 | rayon = "1.0.2" |
21 | fst = { version = "0.3.1", default-features = false } | 21 | fst = { version = "0.3.1", default-features = false } |
22 | rustc-hash = "1.0" | 22 | rustc-hash = "1.0" |
23 | unicase = "2.2.0" | ||
24 | superslice = "1.0.0" | 23 | superslice = "1.0.0" |
25 | once_cell = "1.2.0" | 24 | once_cell = "1.2.0" |
26 | 25 | ||
diff --git a/crates/ra_ide_db/src/symbol_index.rs b/crates/ra_ide_db/src/symbol_index.rs index 64ddf2f95..e6b3126b6 100644 --- a/crates/ra_ide_db/src/symbol_index.rs +++ b/crates/ra_ide_db/src/symbol_index.rs | |||
@@ -21,6 +21,7 @@ | |||
21 | //! those FSTs. | 21 | //! those FSTs. |
22 | 22 | ||
23 | use std::{ | 23 | use std::{ |
24 | cmp::Ordering, | ||
24 | fmt, | 25 | fmt, |
25 | hash::{Hash, Hasher}, | 26 | hash::{Hash, Hasher}, |
26 | mem, | 27 | mem, |
@@ -187,29 +188,34 @@ impl Hash for SymbolIndex { | |||
187 | 188 | ||
188 | impl SymbolIndex { | 189 | impl SymbolIndex { |
189 | fn new(mut symbols: Vec<FileSymbol>) -> SymbolIndex { | 190 | fn new(mut symbols: Vec<FileSymbol>) -> SymbolIndex { |
190 | fn cmp_key<'a>(s1: &'a FileSymbol) -> impl Ord + 'a { | 191 | fn cmp(lhs: &FileSymbol, rhs: &FileSymbol) -> Ordering { |
191 | unicase::Ascii::new(s1.name.as_str()) | 192 | let lhs_chars = lhs.name.chars().map(|c| c.to_ascii_lowercase()); |
193 | let rhs_chars = rhs.name.chars().map(|c| c.to_ascii_lowercase()); | ||
194 | lhs_chars.cmp(rhs_chars) | ||
192 | } | 195 | } |
196 | |||
193 | #[cfg(not(feature = "wasm"))] | 197 | #[cfg(not(feature = "wasm"))] |
194 | symbols.par_sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2))); | 198 | symbols.par_sort_by(cmp); |
195 | 199 | ||
196 | #[cfg(feature = "wasm")] | 200 | #[cfg(feature = "wasm")] |
197 | symbols.sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2))); | 201 | symbols.sort_by(cmp); |
198 | 202 | ||
199 | let mut builder = fst::MapBuilder::memory(); | 203 | let mut builder = fst::MapBuilder::memory(); |
200 | 204 | ||
201 | let mut last_batch_start = 0; | 205 | let mut last_batch_start = 0; |
202 | 206 | ||
203 | for idx in 0..symbols.len() { | 207 | for idx in 0..symbols.len() { |
204 | if symbols.get(last_batch_start).map(cmp_key) == symbols.get(idx + 1).map(cmp_key) { | 208 | if let Some(next_symbol) = symbols.get(idx + 1) { |
205 | continue; | 209 | if cmp(&symbols[last_batch_start], next_symbol) == Ordering::Equal { |
210 | continue; | ||
211 | } | ||
206 | } | 212 | } |
207 | 213 | ||
208 | let start = last_batch_start; | 214 | let start = last_batch_start; |
209 | let end = idx + 1; | 215 | let end = idx + 1; |
210 | last_batch_start = end; | 216 | last_batch_start = end; |
211 | 217 | ||
212 | let key = symbols[start].name.as_str().to_lowercase(); | 218 | let key = symbols[start].name.as_str().to_ascii_lowercase(); |
213 | let value = SymbolIndex::range_to_map_value(start, end); | 219 | let value = SymbolIndex::range_to_map_value(start, end); |
214 | 220 | ||
215 | builder.insert(key, value).unwrap(); | 221 | builder.insert(key, value).unwrap(); |