aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-05 12:16:25 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-05 12:16:25 +0000
commit41838254750fac3822bfe43b04158977e5355e42 (patch)
tree6c8cda1424d329c464119059bd388db1be20a3c3 /crates
parent4d4c46aff8f9a7ce8c2f91fbe6c7c363f5d3e08c (diff)
parentc73cc0ab8fbd02027712844584e56a04dc41fcd7 (diff)
Merge #740
740: Update dependencies r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]> Co-authored-by: Jeremy Kolb <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_ide_api/Cargo.toml2
-rw-r--r--crates/ra_ide_api_light/Cargo.toml4
-rw-r--r--crates/ra_ide_api_light/src/line_index.rs2
-rw-r--r--crates/ra_ide_api_light/src/line_index_utils.rs2
-rw-r--r--crates/ra_text_edit/Cargo.toml2
6 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 4309a05d6..b47ce7952 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -22,4 +22,4 @@ test_utils = { path = "../test_utils" }
22 22
23[dev-dependencies] 23[dev-dependencies]
24flexi_logger = "0.10.0" 24flexi_logger = "0.10.0"
25insta = "0.5.1" 25insta = "0.6.1"
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index 908899129..54de9b2e3 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -26,7 +26,7 @@ hir = { path = "../ra_hir", package = "ra_hir" }
26test_utils = { path = "../test_utils" } 26test_utils = { path = "../test_utils" }
27 27
28[dev-dependencies] 28[dev-dependencies]
29insta = "0.5.1" 29insta = "0.6.1"
30 30
31[features] 31[features]
32jemalloc = [ "jemallocator", "jemalloc-ctl" ] 32jemalloc = [ "jemallocator", "jemalloc-ctl" ]
diff --git a/crates/ra_ide_api_light/Cargo.toml b/crates/ra_ide_api_light/Cargo.toml
index 922245390..c1e4314ce 100644
--- a/crates/ra_ide_api_light/Cargo.toml
+++ b/crates/ra_ide_api_light/Cargo.toml
@@ -16,5 +16,5 @@ ra_text_edit = { path = "../ra_text_edit" }
16 16
17[dev-dependencies] 17[dev-dependencies]
18test_utils = { path = "../test_utils" } 18test_utils = { path = "../test_utils" }
19proptest = "0.8.7" 19proptest = "0.9.0"
20insta = "0.5.1" 20insta = "0.6.1"
diff --git a/crates/ra_ide_api_light/src/line_index.rs b/crates/ra_ide_api_light/src/line_index.rs
index 898fee7e0..131737743 100644
--- a/crates/ra_ide_api_light/src/line_index.rs
+++ b/crates/ra_ide_api_light/src/line_index.rs
@@ -154,7 +154,7 @@ pub fn to_line_col(text: &str, offset: TextUnit) -> LineCol {
154#[cfg(test)] 154#[cfg(test)]
155mod test_line_index { 155mod test_line_index {
156 use super::*; 156 use super::*;
157 use proptest::{prelude::*, proptest, proptest_helper}; 157 use proptest::{prelude::*, proptest};
158 use ra_text_edit::test_utils::{arb_text, arb_offset}; 158 use ra_text_edit::test_utils::{arb_text, arb_offset};
159 159
160 #[test] 160 #[test]
diff --git a/crates/ra_ide_api_light/src/line_index_utils.rs b/crates/ra_ide_api_light/src/line_index_utils.rs
index ec3269bbb..5d9ab6fd2 100644
--- a/crates/ra_ide_api_light/src/line_index_utils.rs
+++ b/crates/ra_ide_api_light/src/line_index_utils.rs
@@ -320,7 +320,7 @@ pub fn translate_offset_with_edit(
320#[cfg(test)] 320#[cfg(test)]
321mod test { 321mod test {
322 use super::*; 322 use super::*;
323 use proptest::{prelude::*, proptest, proptest_helper}; 323 use proptest::{prelude::*, proptest};
324 use crate::line_index; 324 use crate::line_index;
325 use ra_text_edit::test_utils::{arb_offset, arb_text_with_edit}; 325 use ra_text_edit::test_utils::{arb_offset, arb_text_with_edit};
326 use ra_text_edit::TextEdit; 326 use ra_text_edit::TextEdit;
diff --git a/crates/ra_text_edit/Cargo.toml b/crates/ra_text_edit/Cargo.toml
index 71f6ce1ad..7f30251d4 100644
--- a/crates/ra_text_edit/Cargo.toml
+++ b/crates/ra_text_edit/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
7 7
8[dependencies] 8[dependencies]
9text_unit = "0.1.6" 9text_unit = "0.1.6"
10proptest = "0.8.7" 10proptest = "0.9.0"
11 11
12[dev-dependencies] 12[dev-dependencies]
13test_utils = { path = "../test_utils" } 13test_utils = { path = "../test_utils" }