Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #3218

Browse source 
3218: Cut some deps r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-02-18 13:46:54 +00:00 committed by GitHub
commit eab80cd961
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@ crates/*/target
*.log
*.iml
.vscode/settings.json
cargo-timing*.html

20
Cargo.lock generated
View file

@ -1043,7 +1043,6 @@ version = "0.1.0"
dependencies = [
"either",
"format-buf",
"fst",
"indexmap",
"insta",
"itertools",
@ -1060,11 +1059,8 @@ dependencies = [
"ra_syntax",
"ra_text_edit",
"rand",
"rayon",
"rustc-hash",
"superslice",
"test_utils",
"unicase",
]
[[package]]
@ -1091,7 +1087,6 @@ dependencies = [
"rustc-hash",
"superslice",
"test_utils",
"unicase",
]
[[package]]
@ -1602,15 +1597,6 @@ dependencies = [
"num_cpus",
]
[[package]]
name = "unicase"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
dependencies = [
"version_check",
]
[[package]]
name = "unicode-bidi"
version = "0.3.4"
@ -1653,12 +1639,6 @@ dependencies = [
"serde",
]
[[package]]
name = "version_check"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
[[package]]
name = "walkdir"
version = "2.3.1"

4
crates/ra_ide/Cargo.toml
View file

@ -17,11 +17,7 @@ indexmap = "1.3.0"
itertools = "0.8.0"
join_to_string = "0.1.3"
log = "0.4.5"
rayon = "1.0.2"
fst = { version = "0.3.1", default-features = false }
rustc-hash = "1.0"
unicase = "2.2.0"
superslice = "1.0.0"
rand = { version = "0.7.0", features = ["small_rng"] }
once_cell = "1.2.0"

1
crates/ra_ide_db/Cargo.toml
View file

@ -20,7 +20,6 @@ log = "0.4.5"
rayon = "1.0.2"
fst = { version = "0.3.1", default-features = false }
rustc-hash = "1.0"
unicase = "2.2.0"
superslice = "1.0.0"
once_cell = "1.2.0"

20
crates/ra_ide_db/src/symbol_index.rs
View file

@ -21,6 +21,7 @@
//! those FSTs.
use std::{
cmp::Ordering,
fmt,
hash::{Hash, Hasher},
mem,
@ -187,29 +188,34 @@ impl Hash for SymbolIndex {
impl SymbolIndex {
fn new(mut symbols: Vec<FileSymbol>) -> SymbolIndex {
fn cmp_key<'a>(s1: &'a FileSymbol) -> impl Ord + 'a {
unicase::Ascii::new(s1.name.as_str())
fn cmp(lhs: &FileSymbol, rhs: &FileSymbol) -> Ordering {
let lhs_chars = lhs.name.chars().map(|c| c.to_ascii_lowercase());
let rhs_chars = rhs.name.chars().map(|c| c.to_ascii_lowercase());
lhs_chars.cmp(rhs_chars)
}
#[cfg(not(feature = "wasm"))]
symbols.par_sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2)));
symbols.par_sort_by(cmp);
#[cfg(feature = "wasm")]
symbols.sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2)));
symbols.sort_by(cmp);
let mut builder = fst::MapBuilder::memory();
let mut last_batch_start = 0;
for idx in 0..symbols.len() {
if symbols.get(last_batch_start).map(cmp_key) == symbols.get(idx + 1).map(cmp_key) {
continue;
if let Some(next_symbol) = symbols.get(idx + 1) {
if cmp(&symbols[last_batch_start], next_symbol) == Ordering::Equal {
continue;
}
}
let start = last_batch_start;
let end = idx + 1;
last_batch_start = end;
let key = symbols[start].name.as_str().to_lowercase();
let key = symbols[start].name.as_str().to_ascii_lowercase();
let value = SymbolIndex::range_to_map_value(start, end);
builder.insert(key, value).unwrap();