aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-12 16:11:19 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-12 16:11:19 +0000
commit3e367b5760117856bd178d637f740a7f0cd1ffee (patch)
treeeb406c32ab52d2f92d8aa9736a5a7c4d37793e9e
parentafdcfb79b9697cec4812d262ffb58bffd5555761 (diff)
parentc15d0e0194c1ecbefd39263ce7bec7d95dccc111 (diff)
Merge #809
809: what goes bump in the night? r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
-rw-r--r--Cargo.lock26
-rw-r--r--crates/ra_ide_api_light/Cargo.toml2
2 files changed, 12 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ff24b9dc8..65ffff90a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ name = "aho-corasick"
5version = "0.6.9" 5version = "0.6.9"
6source = "registry+https://github.com/rust-lang/crates.io-index" 6source = "registry+https://github.com/rust-lang/crates.io-index"
7dependencies = [ 7dependencies = [
8 "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 8 "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
9] 9]
10 10
11[[package]] 11[[package]]
@@ -667,12 +667,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
667 667
668[[package]] 668[[package]]
669name = "memchr" 669name = "memchr"
670version = "2.1.3" 670version = "2.2.0"
671source = "registry+https://github.com/rust-lang/crates.io-index" 671source = "registry+https://github.com/rust-lang/crates.io-index"
672dependencies = [
673 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
674 "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
675]
676 672
677[[package]] 673[[package]]
678name = "memmap" 674name = "memmap"
@@ -786,7 +782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
786 782
787[[package]] 783[[package]]
788name = "num_cpus" 784name = "num_cpus"
789version = "1.9.0" 785version = "1.10.0"
790source = "registry+https://github.com/rust-lang/crates.io-index" 786source = "registry+https://github.com/rust-lang/crates.io-index"
791dependencies = [ 787dependencies = [
792 "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", 788 "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1042,7 +1038,7 @@ dependencies = [
1042 "ra_syntax 0.1.0", 1038 "ra_syntax 0.1.0",
1043 "ra_text_edit 0.1.0", 1039 "ra_text_edit 0.1.0",
1044 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1040 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1045 "superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1041 "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1046 "test_utils 0.1.0", 1042 "test_utils 0.1.0",
1047] 1043]
1048 1044
@@ -1266,7 +1262,7 @@ dependencies = [
1266 "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1262 "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1267 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1263 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1268 "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", 1264 "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
1269 "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 1265 "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
1270] 1266]
1271 1267
1272[[package]] 1268[[package]]
@@ -1296,7 +1292,7 @@ version = "1.1.0"
1296source = "registry+https://github.com/rust-lang/crates.io-index" 1292source = "registry+https://github.com/rust-lang/crates.io-index"
1297dependencies = [ 1293dependencies = [
1298 "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", 1294 "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
1299 "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 1295 "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1300 "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", 1296 "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
1301 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 1297 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
1302 "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1298 "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1530,7 +1526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1530 1526
1531[[package]] 1527[[package]]
1532name = "superslice" 1528name = "superslice"
1533version = "0.1.0" 1529version = "1.0.0"
1534source = "registry+https://github.com/rust-lang/crates.io-index" 1530source = "registry+https://github.com/rust-lang/crates.io-index"
1535 1531
1536[[package]] 1532[[package]]
@@ -1664,7 +1660,7 @@ name = "threadpool"
1664version = "1.7.1" 1660version = "1.7.1"
1665source = "registry+https://github.com/rust-lang/crates.io-index" 1661source = "registry+https://github.com/rust-lang/crates.io-index"
1666dependencies = [ 1662dependencies = [
1667 "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 1663 "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
1668] 1664]
1669 1665
1670[[package]] 1666[[package]]
@@ -1997,7 +1993,7 @@ dependencies = [
1997"checksum lsp-types 0.55.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9092adbc87fcf30f9d371ecea86dafee55e56f282ee19ca282384e3a04926ba9" 1993"checksum lsp-types 0.55.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9092adbc87fcf30f9d371ecea86dafee55e56f282ee19ca282384e3a04926ba9"
1998"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" 1994"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
1999"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 1995"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
2000"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" 1996"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
2001"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" 1997"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
2002"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" 1998"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
2003"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" 1999"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
@@ -2009,7 +2005,7 @@ dependencies = [
2009"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d" 2005"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d"
2010"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" 2006"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
2011"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" 2007"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
2012"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" 2008"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
2013"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee" 2009"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee"
2014"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" 2010"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
2015"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" 2011"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
@@ -2067,7 +2063,7 @@ dependencies = [
2067"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f" 2063"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f"
2068"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" 2064"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
2069"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" 2065"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
2070"checksum superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b50b13d42370e0f5fc62eafdd5c2d20065eaf5458dab215ff3e20e63eea96b30" 2066"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
2071"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" 2067"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
2072"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" 2068"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
2073"checksum tempfile 3.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "37daa55a7240c4931c84559f03b3cad7d19535840d1c4a0cc4e9b2fb0dcf70ff" 2069"checksum tempfile 3.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "37daa55a7240c4931c84559f03b3cad7d19535840d1c4a0cc4e9b2fb0dcf70ff"
diff --git a/crates/ra_ide_api_light/Cargo.toml b/crates/ra_ide_api_light/Cargo.toml
index 0735e6ae1..29c1f4639 100644
--- a/crates/ra_ide_api_light/Cargo.toml
+++ b/crates/ra_ide_api_light/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
7 7
8[dependencies] 8[dependencies]
9itertools = "0.8.0" 9itertools = "0.8.0"
10superslice = "0.1.0" 10superslice = "1.0.0"
11join_to_string = "0.1.1" 11join_to_string = "0.1.1"
12rustc-hash = "1.0" 12rustc-hash = "1.0"
13 13