From 275ad04f9f5117061de8b6d93cfc3612e13f17b9 Mon Sep 17 00:00:00 2001
From: Lukas Piatkowski <luk@fb.com>
Date: Fri, 6 Dec 2019 06:00:41 -0800
Subject: [PATCH] rust toolchain: use RUSTC_BOOTSTRAP when building

Reviewed By: mitrandir77

Differential Revision: D18850917

fbshipit-source-id: f211dfbfadf4b5b0cb372cf8aeb9a232c4b3a739
---
 build/fbcode_builder/getdeps/builder.py  | 2 ++
 build/fbcode_builder/manifests/eden      | 2 +-
 build/fbcode_builder/manifests/rust-shed | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py
index f382d5af9..54c2ed433 100644
--- a/build/fbcode_builder/getdeps/builder.py
+++ b/build/fbcode_builder/getdeps/builder.py
@@ -822,6 +822,8 @@ class CargoBuilder(BuilderBase):
     def run_cargo(self, install_dirs, operation, args=None):
         args = args or []
         env = self._compute_env(install_dirs)
+        # Enable using nightly features with stable compiler
+        env["RUSTC_BOOTSTRAP"] = "1"
         cmd = ["cargo", operation, "-j%s" % self.build_opts.num_jobs] + args
         self._run_cmd(cmd, cwd=self.build_source_dir(), env=env)
 
diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden
index 798f393fb..028665423 100644
--- a/build/fbcode_builder/manifests/eden
+++ b/build/fbcode_builder/manifests/eden
@@ -22,7 +22,7 @@ lz4
 python-toml
 
 [dependencies.fb=on]
-rust-stable
+rust
 
 # macOS ships with sqlite3, and some of the core system
 # frameworks require that that version be linked rather
diff --git a/build/fbcode_builder/manifests/rust-shed b/build/fbcode_builder/manifests/rust-shed
index 28a81d578..0afb829f6 100644
--- a/build/fbcode_builder/manifests/rust-shed
+++ b/build/fbcode_builder/manifests/rust-shed
@@ -26,4 +26,4 @@ tools/rust/ossconfigs = .
 fbthrift
 
 [dependencies.fb=on]
-rust-nightly
+rust