aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-06-07 07:44:51 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-06-07 07:44:51 +0100
commitb81d9a4d452abd49553f78c478f486632be8f92e (patch)
tree4526bfd2b88d4b3a57ccaf103fbc3e95f41dd76f
parent8ba5617613705e82c9f9d4de54985c6a57251ab1 (diff)
parent9d7cb8ce800b0ee8fc31ede74ee4dbc241e3db4e (diff)
Merge #1381
1381: :arrow_up: salsa r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock36
-rw-r--r--Cargo.toml1
2 files changed, 18 insertions, 19 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 562481b69..4fccddc5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -83,7 +83,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
83 83
84[[package]] 84[[package]]
85name = "bitflags" 85name = "bitflags"
86version = "1.0.4" 86version = "1.1.0"
87source = "registry+https://github.com/rust-lang/crates.io-index" 87source = "registry+https://github.com/rust-lang/crates.io-index"
88 88
89[[package]] 89[[package]]
@@ -215,7 +215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
215dependencies = [ 215dependencies = [
216 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 216 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
217 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", 217 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
218 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 218 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
219 "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 219 "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
220 "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 220 "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
221 "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 221 "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -238,7 +238,7 @@ name = "cloudabi"
238version = "0.0.3" 238version = "0.0.3"
239source = "registry+https://github.com/rust-lang/crates.io-index" 239source = "registry+https://github.com/rust-lang/crates.io-index"
240dependencies = [ 240dependencies = [
241 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 241 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
242] 242]
243 243
244[[package]] 244[[package]]
@@ -446,7 +446,7 @@ name = "fsevent"
446version = "0.4.0" 446version = "0.4.0"
447source = "registry+https://github.com/rust-lang/crates.io-index" 447source = "registry+https://github.com/rust-lang/crates.io-index"
448dependencies = [ 448dependencies = [
449 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 449 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
450 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 450 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
451] 451]
452 452
@@ -476,7 +476,7 @@ name = "fuchsia-zircon"
476version = "0.3.3" 476version = "0.3.3"
477source = "registry+https://github.com/rust-lang/crates.io-index" 477source = "registry+https://github.com/rust-lang/crates.io-index"
478dependencies = [ 478dependencies = [
479 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 479 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
480 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", 480 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
481] 481]
482 482
@@ -561,7 +561,7 @@ name = "inotify"
561version = "0.6.1" 561version = "0.6.1"
562source = "registry+https://github.com/rust-lang/crates.io-index" 562source = "registry+https://github.com/rust-lang/crates.io-index"
563dependencies = [ 563dependencies = [
564 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 564 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
565 "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 565 "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
566 "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", 566 "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
567] 567]
@@ -712,7 +712,7 @@ name = "lsp-types"
712version = "0.57.2" 712version = "0.57.2"
713source = "registry+https://github.com/rust-lang/crates.io-index" 713source = "registry+https://github.com/rust-lang/crates.io-index"
714dependencies = [ 714dependencies = [
715 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 715 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
716 "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", 716 "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
717 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 717 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
718 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 718 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -801,7 +801,7 @@ name = "notify"
801version = "4.0.12" 801version = "4.0.12"
802source = "registry+https://github.com/rust-lang/crates.io-index" 802source = "registry+https://github.com/rust-lang/crates.io-index"
803dependencies = [ 803dependencies = [
804 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 804 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
805 "filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", 805 "filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
806 "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 806 "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
807 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 807 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -973,7 +973,7 @@ version = "0.9.3"
973source = "registry+https://github.com/rust-lang/crates.io-index" 973source = "registry+https://github.com/rust-lang/crates.io-index"
974dependencies = [ 974dependencies = [
975 "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", 975 "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
976 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 976 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
977 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 977 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
978 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 978 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
979 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 979 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1059,7 +1059,7 @@ dependencies = [
1059 "ra_syntax 0.1.0", 1059 "ra_syntax 0.1.0",
1060 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1060 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1061 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1061 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1062 "salsa 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)", 1062 "salsa 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
1063 "test_utils 0.1.0", 1063 "test_utils 0.1.0",
1064] 1064]
1065 1065
@@ -1426,7 +1426,7 @@ version = "0.4.2"
1426source = "registry+https://github.com/rust-lang/crates.io-index" 1426source = "registry+https://github.com/rust-lang/crates.io-index"
1427dependencies = [ 1427dependencies = [
1428 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", 1428 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
1429 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 1429 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1430 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1430 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
1431] 1431]
1432 1432
@@ -1469,8 +1469,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1469 1469
1470[[package]] 1470[[package]]
1471name = "salsa" 1471name = "salsa"
1472version = "0.12.1" 1472version = "0.12.2"
1473source = "git+https://github.com/matklad/salsa?branch=strong-panic-safety#fcc7058e9cbdec838a3d9e6721a0da2892fe4ce1" 1473source = "registry+https://github.com/rust-lang/crates.io-index"
1474dependencies = [ 1474dependencies = [
1475 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1475 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
1476 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1476 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1478,14 +1478,14 @@ dependencies = [
1478 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1478 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1479 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1479 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1480 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1480 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1481 "salsa-macros 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)", 1481 "salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
1482 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", 1482 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
1483] 1483]
1484 1484
1485[[package]] 1485[[package]]
1486name = "salsa-macros" 1486name = "salsa-macros"
1487version = "0.12.1" 1487version = "0.12.1"
1488source = "git+https://github.com/matklad/salsa?branch=strong-panic-safety#fcc7058e9cbdec838a3d9e6721a0da2892fe4ce1" 1488source = "registry+https://github.com/rust-lang/crates.io-index"
1489dependencies = [ 1489dependencies = [
1490 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1490 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1491 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1491 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1993,7 +1993,7 @@ dependencies = [
1993"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" 1993"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
1994"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" 1994"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
1995"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" 1995"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb"
1996"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" 1996"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
1997"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" 1997"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
1998"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" 1998"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"
1999"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" 1999"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
@@ -2127,8 +2127,8 @@ dependencies = [
2127"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" 2127"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
2128"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 2128"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
2129"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" 2129"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
2130"checksum salsa 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)" = "<none>" 2130"checksum salsa 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2208fabe493ad352dc4f544c482b39e9b9a2c1719d9aa4a0f5e828a61210956"
2131"checksum salsa-macros 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)" = "<none>" 2131"checksum salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7f1e25ca2b995bdf032946174929d62156ffd57abd7ff88dc6f9bdeb5ac0c59"
2132"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 2132"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
2133"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 2133"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
2134"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" 2134"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
diff --git a/Cargo.toml b/Cargo.toml
index 5106ea91d..c5155e899 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,4 +6,3 @@ incremental = true
6debug = true 6debug = true
7 7
8[patch.'crates-io'] 8[patch.'crates-io']
9salsa = { git = "https://github.com/matklad/salsa", branch = "strong-panic-safety" } \ No newline at end of file