From 8039e2a55a9e01064b65a78423b0a49ac71d4361 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 14 Jan 2019 03:37:24 +0100 Subject: [PATCH] third_party: upgrade rust crates, now with `--edition 2018` support --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- build_extra/rust/BUILD.gn | 4 +++- third_party | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b35a1a3787..1d4043be25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -184,7 +184,7 @@ dependencies = [ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rustyline 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "source-map-mappings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -754,7 +754,7 @@ dependencies = [ [[package]] name = "rustyline" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1355,7 +1355,7 @@ dependencies = [ "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7891791343c75b73ed9a18cadcafd8c8563d11a88ebe2d87f5b8a3182654d9" -"checksum rustyline 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6010155119d53aac4f5b987cb8f6ea913d0d64d9b237da36f8f96a90cb3f5385" +"checksum rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb02ba7748691403057542ee60a1e7688fdfb46bd3bee752b8977537ee003ae2" "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" diff --git a/Cargo.toml b/Cargo.toml index 430f980b2b..bc9b84b10f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ log = "0.4.6" rand = "0.6.4" remove_dir_all = "0.5.1" ring = "0.13.5" -rustyline = "2.1.0" +rustyline = "3.0.0" serde_json = "1.0.35" source-map-mappings = "0.5.0" tempfile = "3.0.5" diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn index 7374dd7ed3..0757196673 100644 --- a/build_extra/rust/BUILD.gn +++ b/build_extra/rust/BUILD.gn @@ -880,7 +880,7 @@ rust_crate("rustls") { } rust_crate("rustyline") { - source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustyline-2.1.0/src/lib.rs" + source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustyline-3.0.0/src/lib.rs" extern = [ ":dirs", ":libc", @@ -892,6 +892,8 @@ rust_crate("rustyline") { args = [ "--cap-lints", "allow", + "--edition", + "2018", ] if (is_posix) { extern += [ diff --git a/third_party b/third_party index 95c87592da..2e41cca17e 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 95c87592dac0c84083fa067217ec7aeabf255e59 +Subproject commit 2e41cca17e585bba70bd4e945290db3d4e4ae5d1