12 files changed, 6 insertions, 63 deletions

diff --git a/Cargo.lock b/Cargo.lock
index e64c757aa..49fddef4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -906,7 +906,6 @@ version = "0.1.0"
 name = "ra_assists"
 version = "0.1.0"
 dependencies = [
- "either",
  "format-buf",
  "join_to_string",
  "ra_db",
@@ -927,10 +926,8 @@ dependencies = [
  "cargo_metadata",
  "crossbeam-channel",
  "insta",
- "jod-thread",
  "log",
  "lsp-types",
- "parking_lot",
  "serde_json",
 ]
 
@@ -988,7 +985,6 @@ dependencies = [
  "drop_bomb",
  "either",
  "insta",
- "itertools",
  "log",
  "once_cell",
  "ra_arena",
@@ -1046,7 +1042,6 @@ version = "0.1.0"
 dependencies = [
  "either",
  "format-buf",
- "fst",
  "indexmap",
  "insta",
  "itertools",
@@ -1063,9 +1058,7 @@ dependencies = [
  "ra_syntax",
  "ra_text_edit",
  "rand",
- "rayon",
  "rustc-hash",
- "superslice",
  "test_utils",
 ]
 
@@ -1073,18 +1066,9 @@ dependencies = [
 name = "ra_ide_db"
 version = "0.1.0"
 dependencies = [
- "either",
- "format-buf",
  "fst",
- "indexmap",
- "insta",
- "itertools",
- "join_to_string",
  "log",
- "once_cell",
- "ra_cfg",
  "ra_db",
- "ra_fmt",
  "ra_hir",
  "ra_prof",
  "ra_syntax",
@@ -1092,7 +1076,6 @@ dependencies = [
  "rayon",
  "rustc-hash",
  "superslice",
- "test_utils",
 ]
 
 [[package]]
@@ -1120,7 +1103,6 @@ name = "ra_prof"
 version = "0.1.0"
 dependencies = [
  "backtrace",
- "itertools",
  "jemalloc-ctl",
  "jemallocator",
  "once_cell",
@@ -1163,7 +1145,6 @@ dependencies = [
 name = "ra_text_edit"
 version = "0.1.0"
 dependencies = [
- "test_utils",
  "text_unit",
 ]
 
@@ -1322,7 +1303,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
- "either",
  "env_logger",
  "globset",
  "itertools",
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index 12a933645..d314dc8e6 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -11,7 +11,6 @@ doctest = false
 format-buf = "1.0.0"
 join_to_string = "0.1.3"
 rustc-hash = "1.1.0"
-either = "1.5.3"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
diff --git a/crates/ra_cargo_watch/Cargo.toml b/crates/ra_cargo_watch/Cargo.toml
index 989ccc097..1fdbffea1 100644
--- a/crates/ra_cargo_watch/Cargo.toml
+++ b/crates/ra_cargo_watch/Cargo.toml
@@ -9,10 +9,7 @@ crossbeam-channel = "0.4.0"
 lsp-types = { version = "0.71.0", features = ["proposed"] }
 log = "0.4.8"
 cargo_metadata = "0.9.1"
-jod-thread = "0.1.0"
-parking_lot = "0.10.0"
 serde_json = "1.0.48"
 
 [dev-dependencies]
 insta = "0.13.1"
-serde_json = "1.0.48"
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 5b0b94e34..c3d8ee1ae 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -388,7 +388,7 @@ fn original_range_and_origin(
     let single = skip_trivia_token(node.value.first_token()?, Direction::Next)?
         == skip_trivia_token(node.value.last_token()?, Direction::Prev)?;
 
-    return Some(node.value.descendants().find_map(|it| {
+    Some(node.value.descendants().find_map(|it| {
         let first = skip_trivia_token(it.first_token()?, Direction::Next)?;
         let last = skip_trivia_token(it.last_token()?, Direction::Prev)?;
 
@@ -404,16 +404,9 @@ fn original_range_and_origin(
             return None;
         }
 
-        // FIXME: Add union method in TextRange
         Some((
-            first.with_value(union_range(first.value.text_range(), last.value.text_range())),
+            first.with_value(first.value.text_range().extend_to(&last.value.text_range())),
             first_origin,
         ))
-    })?);
-
-    fn union_range(a: TextRange, b: TextRange) -> TextRange {
-        let start = a.start().min(b.start());
-        let end = a.end().max(b.end());
-        TextRange::from_to(start, end)
-    }
+    })?)
 }
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 5053d0688..fa25cc4fb 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -14,7 +14,6 @@ rustc-hash = "1.1.0"
 either = "1.5.3"
 anymap = "0.12.1"
 drop_bomb = "0.1.4"
-itertools = "0.8.2"
 
 ra_arena = { path = "../ra_arena" }
 ra_db = { path = "../ra_db" }
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 6a3112f9c..7625fc8c8 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -17,10 +17,7 @@ indexmap = "1.3.2"
 itertools = "0.8.2"
 join_to_string = "0.1.3"
 log = "0.4.8"
-rayon = "1.3.0"
-fst = { version = "0.3.5", default-features = false }
 rustc-hash = "1.1.0"
-superslice = "1.0.0"
 rand = { version = "0.7.3", features = ["small_rng"] }
 once_cell = "1.3.1"
 
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 2e09bd1ec..f5a063351 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -161,7 +161,7 @@ fn extend_tokens_from_range(
     .take_while(validate)
     .last()?;
 
-    let range = union_range(first.text_range(), last.text_range());
+    let range = first.text_range().extend_to(&last.text_range());
     if original_range.is_subrange(&range) && original_range != range {
         Some(range)
     } else {
@@ -169,12 +169,6 @@ fn extend_tokens_from_range(
     }
 }
 
-fn union_range(range: TextRange, r: TextRange) -> TextRange {
-    let start = range.start().min(r.start());
-    let end = range.end().max(r.end());
-    TextRange::from_to(start, end)
-}
-
 /// Find the shallowest node with same range, which allows us to traverse siblings.
 fn shallowest_node(node: &SyntaxNode) -> SyntaxNode {
     node.ancestors().take_while(|n| n.text_range() == node.text_range()).last().unwrap()
diff --git a/crates/ra_ide_db/Cargo.toml b/crates/ra_ide_db/Cargo.toml
index 2f5b74b92..7b285d280 100644
--- a/crates/ra_ide_db/Cargo.toml
+++ b/crates/ra_ide_db/Cargo.toml
@@ -11,29 +11,17 @@ doctest = false
 wasm = []
 
 [dependencies]
-either = "1.5.3"
-format-buf = "1.0.0"
-indexmap = "1.3.2"
-itertools = "0.8.2"
-join_to_string = "0.1.3"
 log = "0.4.8"
 rayon = "1.3.0"
 fst = { version = "0.3.5", default-features = false }
 rustc-hash = "1.1.0"
 superslice = "1.0.0"
-once_cell = "1.3.1"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
-ra_cfg = { path = "../ra_cfg" }
-ra_fmt = { path = "../ra_fmt" }
 ra_prof = { path = "../ra_prof" }
-test_utils = { path = "../test_utils" }
 
 # ra_ide should depend only on the top-level `hir` package. if you need
 # something from some `hir_xxx` subpackage, reexport the API via `hir`.
 hir = { path = "../ra_hir", package = "ra_hir" }
-
-[dev-dependencies]
-insta = "0.13.1"
diff --git a/crates/ra_prof/Cargo.toml b/crates/ra_prof/Cargo.toml
index 823745795..d15b08992 100644
--- a/crates/ra_prof/Cargo.toml
+++ b/crates/ra_prof/Cargo.toml
@@ -10,7 +10,6 @@ doctest = false
 
 [dependencies]
 once_cell = "1.3.1"
-itertools = "0.8.2"
 backtrace = { version = "0.3.44", optional = true }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
diff --git a/crates/ra_text_edit/Cargo.toml b/crates/ra_text_edit/Cargo.toml
index a32149299..cae28389d 100644
--- a/crates/ra_text_edit/Cargo.toml
+++ b/crates/ra_text_edit/Cargo.toml
@@ -9,7 +9,5 @@ publish = false
 doctest = false
 
 [dependencies]
-text_unit = "0.1.9"
+text_unit = "0.1.10"
 
-[dev-dependencies]
-test_utils = { path = "../test_utils" }
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 2cd39b7be..d00545121 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -15,7 +15,6 @@ path = "./src/bin/main.rs"
 [dependencies]
 anyhow = "1.0.26"
 crossbeam-channel = "0.4.0"
-either = "1.5.3"
 env_logger = { version = "0.7.1", default-features = false }
 globset = "0.4.4"
 itertools = "0.8.2"
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
index 971592b73..6a7c6d6f9 100644
--- a/crates/test_utils/Cargo.toml
+++ b/crates/test_utils/Cargo.toml
@@ -9,5 +9,5 @@ doctest = false
 
 [dependencies]
 difference = "2.0.0"
-text_unit = "0.1.9"
+text_unit = "0.1.10"
 serde_json = "1.0.48"