aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-03-10 13:55:23 +0000
committerAleksey Kladov <[email protected]>2020-03-10 14:03:32 +0000
commit59a3ec5f33c25ce3f372bdb14a333e09ee613004 (patch)
tree6f491d76c5e4cf951ab72bb216948cc71ce34e5d
parentd563e3868b78840d723902cc5767ee567deb5d73 (diff)
:arrow_up: fst
-rw-r--r--Cargo.lock13
-rw-r--r--crates/ra_ide_db/Cargo.toml2
-rw-r--r--crates/ra_ide_db/src/symbol_index.rs4
3 files changed, 5 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 3e58f1e1d..330bdd1cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,12 +88,6 @@ dependencies = [
88] 88]
89 89
90[[package]] 90[[package]]
91name = "byteorder"
92version = "1.3.4"
93source = "registry+https://github.com/rust-lang/crates.io-index"
94checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
95
96[[package]]
97name = "cargo_metadata" 91name = "cargo_metadata"
98version = "0.9.1" 92version = "0.9.1"
99source = "registry+https://github.com/rust-lang/crates.io-index" 93source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -392,12 +386,9 @@ dependencies = [
392 386
393[[package]] 387[[package]]
394name = "fst" 388name = "fst"
395version = "0.3.5" 389version = "0.4.0"
396source = "registry+https://github.com/rust-lang/crates.io-index" 390source = "registry+https://github.com/rust-lang/crates.io-index"
397checksum = "927fb434ff9f0115b215dc0efd2e4fbdd7448522a92a1aa37c77d6a2f8f1ebd6" 391checksum = "3f7c13470d799474d44e2b9c6a0925807def7af4d120cd4de761433be76f7579"
398dependencies = [
399 "byteorder",
400]
401 392
402[[package]] 393[[package]]
403name = "fuchsia-zircon" 394name = "fuchsia-zircon"
diff --git a/crates/ra_ide_db/Cargo.toml b/crates/ra_ide_db/Cargo.toml
index 52f0f23df..de4f5bce0 100644
--- a/crates/ra_ide_db/Cargo.toml
+++ b/crates/ra_ide_db/Cargo.toml
@@ -13,7 +13,7 @@ wasm = []
13[dependencies] 13[dependencies]
14log = "0.4.8" 14log = "0.4.8"
15rayon = "1.3.0" 15rayon = "1.3.0"
16fst = { version = "0.3.5", default-features = false } 16fst = { version = "0.4", default-features = false }
17rustc-hash = "1.1.0" 17rustc-hash = "1.1.0"
18superslice = "1.0.0" 18superslice = "1.0.0"
19once_cell = "1.3.1" 19once_cell = "1.3.1"
diff --git a/crates/ra_ide_db/src/symbol_index.rs b/crates/ra_ide_db/src/symbol_index.rs
index e6b3126b6..884359ee3 100644
--- a/crates/ra_ide_db/src/symbol_index.rs
+++ b/crates/ra_ide_db/src/symbol_index.rs
@@ -163,7 +163,7 @@ pub fn index_resolve(db: &RootDatabase, name_ref: &ast::NameRef) -> Vec<FileSymb
163#[derive(Default)] 163#[derive(Default)]
164pub struct SymbolIndex { 164pub struct SymbolIndex {
165 symbols: Vec<FileSymbol>, 165 symbols: Vec<FileSymbol>,
166 map: fst::Map, 166 map: fst::Map<Vec<u8>>,
167} 167}
168 168
169impl fmt::Debug for SymbolIndex { 169impl fmt::Debug for SymbolIndex {
@@ -221,7 +221,7 @@ impl SymbolIndex {
221 builder.insert(key, value).unwrap(); 221 builder.insert(key, value).unwrap();
222 } 222 }
223 223
224 let map = fst::Map::from_bytes(builder.into_inner().unwrap()).unwrap(); 224 let map = fst::Map::new(builder.into_inner().unwrap()).unwrap();
225 SymbolIndex { symbols, map } 225 SymbolIndex { symbols, map }
226 } 226 }
227 227