]> git.lizzy.rs Git - rust.git/commitdiff
Merge #6577 #6579 #6581
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Tue, 17 Nov 2020 18:01:18 +0000 (18:01 +0000)
committerGitHub <noreply@github.com>
Tue, 17 Nov 2020 18:01:18 +0000 (18:01 +0000)
6577: fix typos in syntax.md r=matklad a=jakobhellermann

6579: cargo update and add new license r=matklad a=kjeremy

6581: Use vscode-languageclient 7.0.0-next.14 r=matklad a=kjeremy

Co-authored-by: Jakob Hellermann <jakob.hellermann@protonmail.com>
Co-authored-by: kjeremy <kjeremy@gmail.com>
1  2  3  4 
Cargo.lock

diff --combined Cargo.lock
index b236d69cc52c2f42f5fdab0ad44bb33f9a90e939,09215a37a2be110cfc2cb0ef610f446affb16e4f,53f1a1c1ee603113a4a5c17f5a82666612ea5022,09215a37a2be110cfc2cb0ef610f446affb16e4f..6345ce9934343823187f626e70517410e708fc95
@@@@@ -242,9 -242,9 -242,9 -242,9 +242,9 @@@@@ dependencies = 
    
    [[package]]
    name = "cmake"
-- -version = "0.1.44"
++ +version = "0.1.45"
    source = "registry+https://github.com/rust-lang/crates.io-index"
-- -checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb"
++ +checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
    dependencies = [
     "cc",
    ]
@@@@@ -255,7 -255,6 -255,6 -255,6 +255,7 @@@@@ version = "0.0.0
    dependencies = [
     "assists",
     "base_db",
 +++ "either",
     "expect-test",
     "hir",
     "ide_db",
@@@@@ -1066,9 -1065,9 -1065,9 -1065,9 +1066,9 @@@@@ checksum = "8d3b63360ec3cb337817c2dbd47
    
    [[package]]
    name = "once_cell"
-- -version = "1.5.1"
++ +version = "1.5.2"
    source = "registry+https://github.com/rust-lang/crates.io-index"
-- -checksum = "f53cef67919d7d247eb9a2f128ca9e522789967ef1eb4ccd8c71a95a8aedf596"
++ +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
    
    [[package]]
    name = "oorandom"
@@@@@ -1740,9 -1739,9 -1739,18 -1739,9 +1740,18 @@@@@ dependencies = 
    
    [[package]]
    name = "tinyvec"
-- -version = "0.3.4"
++ +version = "1.0.1"
+   source = "registry+https://github.com/rust-lang/crates.io-index"
 - -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
++ +checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575"
++ +dependencies = [
++ + "tinyvec_macros",
++ +]
++ +
++ +[[package]]
++ +name = "tinyvec_macros"
++ +version = "0.1.0"
 + +source = "registry+https://github.com/rust-lang/crates.io-index"
-   checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
++ +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
    
    [[package]]
    name = "toolchain"
@@@@@ -1880,18 -1879,18 -1888,18 -1879,18 +1889,18 @@@@@ dependencies = 
    
    [[package]]
    name = "unicode-normalization"
-- -version = "0.1.13"
++ +version = "0.1.14"
    source = "registry+https://github.com/rust-lang/crates.io-index"
-- -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
++ +checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6"
    dependencies = [
     "tinyvec",
    ]
    
    [[package]]
    name = "unicode-segmentation"
-- -version = "1.6.0"
++ +version = "1.7.0"
    source = "registry+https://github.com/rust-lang/crates.io-index"
-- -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
++ +checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae"
    
    [[package]]
    name = "unicode-xid"