]> 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 --cc Cargo.lock
index b236d69cc52c2f42f5fdab0ad44bb33f9a90e939,09215a37a2be110cfc2cb0ef610f446affb16e4f,53f1a1c1ee603113a4a5c17f5a82666612ea5022,09215a37a2be110cfc2cb0ef610f446affb16e4f..6345ce9934343823187f626e70517410e708fc95
@@@@@ -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"