From dcb915e7741fbbdb5ca01daae5bb9ade77f59d5e Mon Sep 17 00:00:00 2001 From: Dustin Speckhals Date: Sat, 7 Oct 2017 16:43:07 -0400 Subject: Update rls submodule --- src/tools/rls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/rls b/src/tools/rls index 93b47d14cef..47b5b13426f 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 93b47d14cef5720bba7cfb4dcb8078fbf1f706c1 +Subproject commit 47b5b13426f59aea406d19b57fc43095027a11d3 -- cgit 1.4.1-3-g733a5 From 218103ef5a222af79a80348f55f866c20544848b Mon Sep 17 00:00:00 2001 From: Dustin Speckhals Date: Wed, 11 Oct 2017 12:00:29 -0400 Subject: Update rustfmt along with rls --- src/Cargo.lock | 25 +------------------------ src/tools/rls | 2 +- src/tools/rustfmt | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) (limited to 'src/tools') diff --git a/src/Cargo.lock b/src/Cargo.lock index 554ba463f82..7cd6619285d 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1330,7 +1330,7 @@ dependencies = [ "rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-nightly 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt-nightly 0.2.8", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1810,31 +1810,9 @@ dependencies = [ "rustdoc 0.0.0", ] -[[package]] -name = "rustfmt-nightly" -version = "0.2.7" -dependencies = [ - "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "strings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rustfmt-nightly" version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2585,7 +2563,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff" "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -"checksum rustfmt-nightly 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "a46761e4ae8667da308e9a7ed1a48ef0023a569eacda4b0152b06de4cfe44d57" "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" "checksum scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59a076157c1e2dc561d8de585151ee6965d910dd4dcb5dabb7ae3e83981a6c57" diff --git a/src/tools/rls b/src/tools/rls index 47b5b13426f..96d7461403f 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 47b5b13426f59aea406d19b57fc43095027a11d3 +Subproject commit 96d7461403fb738040635f466441abb633726d39 diff --git a/src/tools/rustfmt b/src/tools/rustfmt index 22eb5241c0e..505439048f7 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit 22eb5241c0ee5bb7eaf95e270a2b1500e82bf767 +Subproject commit 505439048f749769ba41500ce180a25ff982469e -- cgit 1.4.1-3-g733a5 From 69ba6738eb6bf9b6d11ebb81af2599648eb0bc04 Mon Sep 17 00:00:00 2001 From: Dustin Speckhals Date: Fri, 20 Oct 2017 17:11:50 -0400 Subject: Use newest version of RLS and rustfmt --- src/Cargo.lock | 8 ++++++-- src/Cargo.toml | 1 + src/tools/rls | 2 +- src/tools/rustfmt | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/tools') diff --git a/src/Cargo.lock b/src/Cargo.lock index 7cd6619285d..934f5d6eed9 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -506,6 +506,10 @@ dependencies = [ "rustdoc 0.0.0", ] +[[package]] +name = "features" +version = "0.1.0" + [[package]] name = "filetime" version = "0.1.12" @@ -1330,7 +1334,7 @@ dependencies = [ "rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-nightly 0.2.8", + "rustfmt-nightly 0.2.9", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1812,7 +1816,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "0.2.8" +version = "0.2.9" dependencies = [ "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/Cargo.toml b/src/Cargo.toml index 9a9590dc44b..b703b2d7d29 100644 --- a/src/Cargo.toml +++ b/src/Cargo.toml @@ -22,6 +22,7 @@ members = [ # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude "tools/rls/test_data/borrow_error", "tools/rls/test_data/common", + "tools/rls/test_data/features", "tools/rls/test_data/find_all_refs_no_cfg_test", "tools/rls/test_data/reformat", "tools/rls/test_data/multiple_bins", diff --git a/src/tools/rls b/src/tools/rls index 96d7461403f..78175cfde1e 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 96d7461403fb738040635f466441abb633726d39 +Subproject commit 78175cfde1e2ee2125ec7d0d2c7c966a8730e026 diff --git a/src/tools/rustfmt b/src/tools/rustfmt index 505439048f7..9754bcb535f 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit 505439048f749769ba41500ce180a25ff982469e +Subproject commit 9754bcb535fa84c000fe78cb91b30c3f661fc849 -- cgit 1.4.1-3-g733a5 From aba409c1a298a368a0378166c0f6cb9284097578 Mon Sep 17 00:00:00 2001 From: Dustin Speckhals Date: Tue, 24 Oct 2017 21:29:26 -0400 Subject: Update RLS with skip of failing test --- src/tools/rls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/rls b/src/tools/rls index 78175cfde1e..e0348594a72 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 78175cfde1e2ee2125ec7d0d2c7c966a8730e026 +Subproject commit e0348594a724571f1d2387e03943efeb4df20e12 -- cgit 1.4.1-3-g733a5