From df806c511c3a3e0a1a7d8ad2ecd43484f98a94aa Mon Sep 17 00:00:00 2001
From: robertking <superobertking@icloud.com>
Date: Thu, 11 Apr 2019 21:25:08 +0800
Subject: [PATCH 1/2] change default value of ale_rust_rls_toolchain and update
 documentation

---
 ale_linters/rust/rls.vim | 2 +-
 doc/ale-rust.txt         | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ale_linters/rust/rls.vim b/ale_linters/rust/rls.vim
index 0e5c326c..111d7558 100644
--- a/ale_linters/rust/rls.vim
+++ b/ale_linters/rust/rls.vim
@@ -2,7 +2,7 @@
 " Description: A language server for Rust
 
 call ale#Set('rust_rls_executable', 'rls')
-call ale#Set('rust_rls_toolchain', 'nightly')
+call ale#Set('rust_rls_toolchain', '')
 call ale#Set('rust_rls_config', {})
 
 function! ale_linters#rust#rls#GetCommand(buffer) abort
diff --git a/doc/ale-rust.txt b/doc/ale-rust.txt
index 3393b9c0..44a79b18 100644
--- a/doc/ale-rust.txt
+++ b/doc/ale-rust.txt
@@ -164,10 +164,14 @@ g:ale_rust_rls_executable                           *g:ale_rust_rls_executable*
 g:ale_rust_rls_toolchain                             *g:ale_rust_rls_toolchain*
                                                      *b:ale_rust_rls_toolchain*
   Type: |String|
-  Default: `'nightly'`
+  Default: `''`
 
   This option can be set to change the toolchain used for `rls`. Possible
-  values include `'nightly'`, `'beta'`, and `'stable'`.
+  values include `'nightly'`, `'beta'`, `'stable'`, and `''`. When using
+  option `''`, rls will automatically find the default toolchain set by
+  rustup. If you want to use `rls` from a specific toolchain version, you may
+  also use values like `'channel-yyyy-mm-dd-arch-target'` as long as
+  `'rls +{toolchain_name} -V'` runs correctly in your command line.
 
   The `rls` server will only be started once per executable.
 

From fb7099d44018f937566aff7c82e8b59d487f6be1 Mon Sep 17 00:00:00 2001
From: robertking <superobertking@icloud.com>
Date: Thu, 11 Apr 2019 23:38:16 +0800
Subject: [PATCH 2/2] modify rls testcase

---
 test/command_callback/test_rust_rls_callbacks.vader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/command_callback/test_rust_rls_callbacks.vader b/test/command_callback/test_rust_rls_callbacks.vader
index ef4735d2..ec8c8811 100644
--- a/test/command_callback/test_rust_rls_callbacks.vader
+++ b/test/command_callback/test_rust_rls_callbacks.vader
@@ -5,7 +5,7 @@ After:
   call ale#assert#TearDownLinterTest()
 
 Execute(The default executable path should be correct):
-  AssertLinter 'rls', ale#Escape('rls') . ' +' . ale#Escape('nightly')
+  AssertLinter 'rls', ale#Escape('rls')
 
 Execute(The toolchain should be configurable):
   let g:ale_rust_rls_toolchain = 'stable'