]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #58908 - JohnTitor:improve-rand, r=scottmcm
authorMazdak Farrokhzad <twingoow@gmail.com>
Wed, 13 Mar 2019 02:33:37 +0000 (03:33 +0100)
committerGitHub <noreply@github.com>
Wed, 13 Mar 2019 02:33:37 +0000 (03:33 +0100)
Update rand version

cc: #57724

r? @scottmcm

1  2 
Cargo.lock

diff --combined Cargo.lock
index a823bf8afcfa507330956f8b87ed29bb06230023,0406d37b6dc27a2db6f09548fbda5e4ef916c697..39ecc880097e3a9d62049c0d517ba58ce5790e36
@@@ -230,7 -230,7 +230,7 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "cargo"
 -version = "0.35.0"
 +version = "0.36.0"
  dependencies = [
   "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
   "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
   "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 - "crates-io 0.23.0",
 + "crates-io 0.24.0",
   "crossbeam-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -540,7 -540,7 +540,7 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "crates-io"
 -version = "0.23.0"
 +version = "0.24.0"
  dependencies = [
   "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
   "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1340,7 -1340,7 +1340,7 @@@ dependencies = 
  
  [[package]]
  name = "lsp-codec"
 -version = "0.1.1"
 +version = "0.1.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -2232,7 -2232,7 +2232,7 @@@ dependencies = 
  name = "rls"
  version = "1.34.0"
  dependencies = [
 - "cargo 0.35.0",
 + "cargo 0.36.0",
   "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "clippy_lints 0.0.212",
   "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
   "jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 - "lsp-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)",
   "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-analysis 0.16.12 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-blacklist 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-data 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rls-rustc 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rls-rustc 0.6.0",
   "rls-span 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-vfs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -2310,7 -2310,8 +2310,7 @@@ dependencies = 
  
  [[package]]
  name = "rls-rustc"
 -version = "0.5.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
 +version = "0.6.0"
  
  [[package]]
  name = "rls-span"
@@@ -2364,7 -2365,6 +2364,7 @@@ dependencies = 
   "rustc_data_structures 0.0.0",
   "rustc_errors 0.0.0",
   "rustc_fs_util 0.0.0",
 + "rustc_macros 0.1.0",
   "rustc_target 0.0.0",
   "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "serialize 0.0.0",
@@@ -2747,7 -2747,7 +2747,7 @@@ version = "0.0.0
  dependencies = [
   "graphviz 0.0.0",
   "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "rustc 0.0.0",
   "rustc_data_structures 0.0.0",
   "rustc_fs_util 0.0.0",
@@@ -2778,7 -2778,7 +2778,7 @@@ dependencies = 
   "rustc_resolve 0.0.0",
   "rustc_traits 0.0.0",
   "rustc_typeck 0.0.0",
 - "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "serialize 0.0.0",
   "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
   "syntax 0.0.0",
@@@ -2817,16 -2817,6 +2817,16 @@@ dependencies = 
   "core 0.0.0",
  ]
  
 +[[package]]
 +name = "rustc_macros"
 +version = "0.1.0"
 +dependencies = [
 + "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
 + "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
 + "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "rustc_metadata"
  version = "0.0.0"
@@@ -4117,7 -4107,7 +4117,7 @@@ source = "registry+https://github.com/r
  "checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
  "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
  "checksum log_settings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19af41f0565d7c19b2058153ad0b42d4d5ce89ec4dbf06ed6741114a8b63e7cd"
 -"checksum lsp-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3570f641b984e3e4613a1ca34db2ea72549bbc3c0316d33f5af91ab514dcbff"
 +"checksum lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "169d737ad89cf8ddd82d1804d9122f54568c49377665157277cc90d747b1d31a"
  "checksum lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6392b5843615b8a2adeebe87b83fdd29567c0870baba3407a67e6dbfee4712f8"
  "checksum lzma-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d1eaa027402541975218bb0eec67d6b0412f6233af96e0d096d31dbdfd22e614"
  "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
  "checksum rls-analysis 0.16.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ae18d8ad01dec3b2014f4d7ae3c607d7adbcff79e5d3b48ea42ea71c10d43a71"
  "checksum rls-blacklist 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ce1fdac03e138c4617ff87b194e1ff57a39bb985a044ccbd8673d30701e411"
  "checksum rls-data 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f80b84551b32e26affaf7f12374913b5061730c0dcd185d9e8fa5a15e36e65c"
 -"checksum rls-rustc 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9dba7390427aefa953608429701e3665192ca810ba8ae09301e001b7c7bed0"
  "checksum rls-span 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33d66f1d6c6ccd5c98029f162544131698f6ebb61d8c697681cac409dcd08805"
  "checksum rls-vfs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "72d56425bd5aa86d9d4372b76f0381d3b4bda9c0220e71956c9fcc929f45c1f1"
  "checksum rustc-ap-arena 373.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8be999235b541fc8eb54901b66e899a06076709ac5f53d6b2c5c59d29ad54780"