aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-11 10:21:41 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-11 10:21:41 +0000
commitdd122145b57513cf57076ae3235d70215b226039 (patch)
tree3f01166b8148b0703a6318662bbd93c51a2aa3e8
parent28559b7dd2e2c101c4b7f2c9bb207b3af94f6e16 (diff)
parent66d7adf1cbbe727bfdef6db3fbf8d15bc0e747df (diff)
Merge #493
493: force serde in ra_syntax r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock9
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_syntax/Cargo.toml7
-rw-r--r--crates/ra_syntax/fuzz/Cargo.lock19
4 files changed, 26 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 877ef9410..006a17622 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -743,10 +743,8 @@ dependencies = [
743 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 743 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
744 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", 744 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
745 "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", 745 "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
746 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
747 "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", 746 "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
748 "test_utils 0.1.0", 747 "test_utils 0.1.0",
749 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
750 "thread_worker 0.1.0", 748 "thread_worker 0.1.0",
751 "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 749 "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
752 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 750 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -763,6 +761,7 @@ dependencies = [
763 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 761 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
764 "ra_text_edit 0.1.0", 762 "ra_text_edit 0.1.0",
765 "rowan 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 763 "rowan 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
764 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
766 "test_utils 0.1.0", 765 "test_utils 0.1.0",
767 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 766 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
768 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 767 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -980,7 +979,7 @@ version = "0.2.0"
980source = "registry+https://github.com/rust-lang/crates.io-index" 979source = "registry+https://github.com/rust-lang/crates.io-index"
981dependencies = [ 980dependencies = [
982 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 981 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
983 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 982 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
984 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 983 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
985] 984]
986 985
@@ -1119,7 +1118,7 @@ dependencies = [
1119 1118
1120[[package]] 1119[[package]]
1121name = "smol_str" 1120name = "smol_str"
1122version = "0.1.8" 1121version = "0.1.9"
1123source = "registry+https://github.com/rust-lang/crates.io-index" 1122source = "registry+https://github.com/rust-lang/crates.io-index"
1124dependencies = [ 1123dependencies = [
1125 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", 1124 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1591,7 +1590,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1591"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded" 1590"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
1592"checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" 1591"checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373"
1593"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db" 1592"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
1594"checksum smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "486a74e9b9fc53373808f7a17e10fc728adcb1fbe272292271d8bea61175e181" 1593"checksum smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9af1035bc5d742ab6b7ab16713e41cc2ffe78cb474f6f43cd696b2d16052007e"
1595"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" 1594"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
1596"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" 1595"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
1597"checksum superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b50b13d42370e0f5fc62eafdd5c2d20065eaf5458dab215ff3e20e63eea96b30" 1596"checksum superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b50b13d42370e0f5fc62eafdd5c2d20065eaf5458dab215ff3e20e63eea96b30"
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index a0819978b..7e307eb1c 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -21,8 +21,6 @@ languageserver-types = "0.53.1"
21walkdir = "2.2.7" 21walkdir = "2.2.7"
22im = "12.0.0" 22im = "12.0.0"
23cargo_metadata = "0.6.0" 23cargo_metadata = "0.6.0"
24text_unit = { version = "0.1.2", features = ["serde"] }
25smol_str = { version = "0.1.5", features = ["serde"] }
26rustc-hash = "1.0" 24rustc-hash = "1.0"
27parking_lot = "0.7.0" 25parking_lot = "0.7.0"
28 26
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 7c8e5b696..d5b4a4a77 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -14,7 +14,12 @@ itertools = "0.8.0"
14drop_bomb = "0.1.4" 14drop_bomb = "0.1.4"
15parking_lot = "0.7.0" 15parking_lot = "0.7.0"
16rowan = "0.2.0" 16rowan = "0.2.0"
17text_unit = "0.1.6" 17
18# ideally, `serde` should be enabled by `ra_lsp_serder`, but we enable it here
19# to reduce number of compilations
20text_unit = { version = "0.1.6", features = ["serde"] }
21smol_str = { version = "0.1.9", features = ["serde"] }
22
18ra_text_edit = { path = "../ra_text_edit" } 23ra_text_edit = { path = "../ra_text_edit" }
19 24
20[dev-dependencies] 25[dev-dependencies]
diff --git a/crates/ra_syntax/fuzz/Cargo.lock b/crates/ra_syntax/fuzz/Cargo.lock
index 77bddab7c..4be6be44f 100644
--- a/crates/ra_syntax/fuzz/Cargo.lock
+++ b/crates/ra_syntax/fuzz/Cargo.lock
@@ -188,6 +188,7 @@ dependencies = [
188 "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 188 "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
189 "ra_text_edit 0.1.0", 189 "ra_text_edit 0.1.0",
190 "rowan 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 190 "rowan 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
191 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
191 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 192 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
192 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 193 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
193] 194]
@@ -320,7 +321,7 @@ version = "0.2.0"
320source = "registry+https://github.com/rust-lang/crates.io-index" 321source = "registry+https://github.com/rust-lang/crates.io-index"
321dependencies = [ 322dependencies = [
322 "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 323 "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
323 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 324 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
324 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 325 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
325] 326]
326 327
@@ -362,6 +363,11 @@ version = "0.7.0"
362source = "registry+https://github.com/rust-lang/crates.io-index" 363source = "registry+https://github.com/rust-lang/crates.io-index"
363 364
364[[package]] 365[[package]]
366name = "serde"
367version = "1.0.84"
368source = "registry+https://github.com/rust-lang/crates.io-index"
369
370[[package]]
365name = "smallvec" 371name = "smallvec"
366version = "0.6.7" 372version = "0.6.7"
367source = "registry+https://github.com/rust-lang/crates.io-index" 373source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -371,8 +377,11 @@ dependencies = [
371 377
372[[package]] 378[[package]]
373name = "smol_str" 379name = "smol_str"
374version = "0.1.8" 380version = "0.1.9"
375source = "registry+https://github.com/rust-lang/crates.io-index" 381source = "registry+https://github.com/rust-lang/crates.io-index"
382dependencies = [
383 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
384]
376 385
377[[package]] 386[[package]]
378name = "stable_deref_trait" 387name = "stable_deref_trait"
@@ -396,6 +405,9 @@ dependencies = [
396name = "text_unit" 405name = "text_unit"
397version = "0.1.6" 406version = "0.1.6"
398source = "registry+https://github.com/rust-lang/crates.io-index" 407source = "registry+https://github.com/rust-lang/crates.io-index"
408dependencies = [
409 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
410]
399 411
400[[package]] 412[[package]]
401name = "ucd-util" 413name = "ucd-util"
@@ -492,8 +504,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
492"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 504"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
493"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 505"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
494"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" 506"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
507"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
495"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db" 508"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
496"checksum smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "486a74e9b9fc53373808f7a17e10fc728adcb1fbe272292271d8bea61175e181" 509"checksum smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9af1035bc5d742ab6b7ab16713e41cc2ffe78cb474f6f43cd696b2d16052007e"
497"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" 510"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
498"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" 511"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
499"checksum text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "158bb1c22b638b1da3c95a8ad9f061ea40d4d39fd0301be3a520f92efeeb189e" 512"checksum text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "158bb1c22b638b1da3c95a8ad9f061ea40d4d39fd0301be3a520f92efeeb189e"