From ddce6bb282764692d53b719bff4c37e3512d4556 Mon Sep 17 00:00:00 2001
From: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
Date: Mon, 8 Mar 2021 09:05:19 +0000
Subject: Support disabling rustc build scripts

---
 editors/code/package.json | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'editors')

diff --git a/editors/code/package.json b/editors/code/package.json
index 1987364bc..82011bb44 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -413,6 +413,11 @@
                     "default": false,
                     "type": "boolean"
                 },
+                "rust-analyzer.cargo.disableRustcBuildScripts": {
+                    "markdownDescription": "Disable running build scripts (`build.rs`) for the `rustc_private` crates in `rustcSource`.",
+                    "default": false,
+                    "type": "boolean"
+                },
                 "rust-analyzer.cargo.noDefaultFeatures": {
                     "markdownDescription": "Do not activate the `default` feature.",
                     "default": false,
-- 
cgit v1.2.3


From bbecea03fda57cced0b4ba95f4bbd45f8d88102c Mon Sep 17 00:00:00 2001
From: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
Date: Mon, 8 Mar 2021 16:37:52 +0000
Subject: Revert "Support disabling rustc build scripts"

This reverts commit ddce6bb282764692d53b719bff4c37e3512d4556.
---
 editors/code/package.json | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'editors')

diff --git a/editors/code/package.json b/editors/code/package.json
index 82011bb44..1987364bc 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -413,11 +413,6 @@
                     "default": false,
                     "type": "boolean"
                 },
-                "rust-analyzer.cargo.disableRustcBuildScripts": {
-                    "markdownDescription": "Disable running build scripts (`build.rs`) for the `rustc_private` crates in `rustcSource`.",
-                    "default": false,
-                    "type": "boolean"
-                },
                 "rust-analyzer.cargo.noDefaultFeatures": {
                     "markdownDescription": "Do not activate the `default` feature.",
                     "default": false,
-- 
cgit v1.2.3


From 20007fd3a8aa16bec0c4f9ebc1489c157f846df4 Mon Sep 17 00:00:00 2001
From: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
Date: Mon, 8 Mar 2021 16:47:40 +0000
Subject: Document rustc_private in metadata

---
 editors/code/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editors')

diff --git a/editors/code/package.json b/editors/code/package.json
index 1987364bc..b39e8fbe3 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -707,7 +707,7 @@
                     }
                 },
                 "rust-analyzer.rustcSource": {
-                    "markdownDescription": "Path to the rust compiler sources, for usage in rustc_private projects, or \"discover\" to try to automatically find it.",
+                    "markdownDescription": "Path to the rust compiler sources, for usage in rustc_private projects, or \"discover\" to try to automatically find it. Any project which uses rust-analyzer with the rustcPrivate crates must set `[package.metadata.rust-analyzer] rustc_private=true` to use it.",
                     "default": null,
                     "type": [
                         "null",
-- 
cgit v1.2.3