From 0e1ff8182341f9b82992a8b204b51d4916ddb0f2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 16 Sep 2022 12:29:04 +0400
Subject: [PATCH 1/2] Add a note about building `rust-analyzer-proc-macro-srv`

---
 src/building/how-to-build-and-run.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/building/how-to-build-and-run.md b/src/building/how-to-build-and-run.md
index 50c086e8f..49cad4881 100644
--- a/src/building/how-to-build-and-run.md
+++ b/src/building/how-to-build-and-run.md
@@ -221,6 +221,15 @@ fall back to using `cargo` from the installed `nightly`, `beta`, or `stable` too
 `rustup install nightly` if you haven't already.  See the
 [rustup documentation on custom toolchains](https://rust-lang.github.io/rustup/concepts/toolchains.html#custom-toolchains).
 
+**Note:** rust-analyzer and IntelliJ Rust plugin use a component called
+`rust-analyzer-proc-macro-srv` to work with proc macros. If you intend to use a
+custom toolchain for a project (e.g. via `rustup override set stage1`) you may
+want to build this component:
+
+```bash
+x b proc-macro-srv-cli
+```
+
 ## Building targets for cross-compilation
 
 To produce a compiler that can cross-compile for other targets,

From 3cdfa24b12bbf03046ae9d64dd3b0cb50636863a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 18 Sep 2022 14:24:39 +0400
Subject: [PATCH 2/2] Don't use shorthands in command examples

---
 src/building/how-to-build-and-run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/building/how-to-build-and-run.md b/src/building/how-to-build-and-run.md
index 49cad4881..c5cf3166d 100644
--- a/src/building/how-to-build-and-run.md
+++ b/src/building/how-to-build-and-run.md
@@ -227,7 +227,7 @@ custom toolchain for a project (e.g. via `rustup override set stage1`) you may
 want to build this component:
 
 ```bash
-x b proc-macro-srv-cli
+./x.py build proc-macro-srv-cli
 ```
 
 ## Building targets for cross-compilation