From 7d997748da14e1b5b64ea92b8fbeab123a1268c9 Mon Sep 17 00:00:00 2001
From: Dominic Cooney <dominic.cooney@gmail.com>
Date: Sat, 22 May 2021 17:53:48 +0900
Subject: [PATCH] Update toolchain to nightly-2021-05-18

The nightly-2021-03-12 toolchain doesn't have RLS on Windows. This
breaks code completion in Visual Studio Code because the rust plugin
picks up the project toolchain.

RLS is available in all tier one platforms in nightly-2021-05-18 per:
https://rust-lang.github.io/rustup-components-history/

Signed-off-by: Dominic Cooney <dominic.cooney@gmail.com>
---
 components/script/lib.rs         | 2 +-
 components/script_plugins/lib.rs | 6 +++++-
 rust-toolchain                   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/script/lib.rs b/components/script/lib.rs
index 86935833157..8c8c4376726 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -3,8 +3,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #![feature(assoc_char_funcs)]
-#![feature(const_fn)]
 #![feature(const_fn_fn_ptr_basics)]
+#![feature(const_fn_trait_bound)]
 #![feature(core_intrinsics)]
 #![feature(drain_filter)]
 #![feature(plugin)]
diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
index 0a4f70c5c58..a42eb96bf23 100644
--- a/components/script_plugins/lib.rs
+++ b/components/script_plugins/lib.rs
@@ -405,7 +405,11 @@ fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool {
 fn in_derive_expn(span: Span) -> bool {
     matches!(
         span.ctxt().outer_expn_data().kind,
-        ExpnKind::Macro(MacroKind::Derive, _)
+        ExpnKind::Macro {
+            kind: MacroKind::Derive,
+            name: _,
+            proc_macro: _,
+        }
     )
 }
 
diff --git a/rust-toolchain b/rust-toolchain
index 02c828fea2f..b2eff28fe03 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-03-12
+nightly-2021-05-18