rust-analyzer

diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 4f8723a936..6aa57b2f9b 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md

@@ -42,7 +42,7 @@ The underlying engine makes sure that model is computed lazily (on-demand) and c

`crates/rust-analyzer/src/bin/main.rs` contains the main function which spawns LSP.

This is *the* entry point, but it front-loads a lot of complexity, so it's fine to just skim through it.

-`crates/rust-analyzer/src/handlers.rs` implements all LSP requests and is a great place to start if you are already familiar with LSP.

+`crates/rust-analyzer/src/handlers/requests.rs` implements all LSP requests and is a great place to start if you are already familiar with LSP.

`Analysis` and `AnalysisHost` types define the main API for consumers of IDE services.

diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts
index b3f1b056a8..fb7e340e51 100644
--- a/editors/code/src/debug.ts
+++ b/editors/code/src/debug.ts

@@ -173,6 +173,8 @@ async function getDebugConfiguration(

if (debugConfig.name === "run binary") {

// The LSP side: crates\rust-analyzer\src\main_loop\handlers.rs,

// fn to_lsp_runnable(...) with RunnableKind::Bin

+ // FIXME: Neither crates\rust-analyzer\src\main_loop\handlers.rs

+ // nor to_lsp_runnable exist anymore

debugConfig.name = `run ${path.basename(executable)}`;

}

diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index dd0da6b62c..8a82a5a58c 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts

@@ -36,7 +36,7 @@ export async function selectRunnable(

if (runnables.length === 0) {

// it is the debug case, run always has at least 'cargo check ...'

- // see crates\rust-analyzer\src\main_loop\handlers.rs, handle_runnables

+ // see crates\rust-analyzer\src\handlers\request.rs, handle_runnables

await vscode.window.showErrorMessage("There's no debug target!");

quickPick.dispose();

return;

diff --git a/editors/code/src/toolchain.ts b/editors/code/src/toolchain.ts
index 850a6a5561..e8bab9c3d8 100644
--- a/editors/code/src/toolchain.ts
+++ b/editors/code/src/toolchain.ts

@@ -29,7 +29,7 @@ export class Cargo {

static artifactSpec(cargoArgs: string[], executableArgs?: string[]): ArtifactSpec {

cargoArgs = [...cargoArgs, "--message-format=json"];

// arguments for a runnable from the quick pick should be updated.

- // see crates\rust-analyzer\src\main_loop\handlers.rs, handle_code_lens

+ // see crates\rust-analyzer\src\handlers\request.rs, handle_code_lens

switch (cargoArgs[0]) {

case "run":

cargoArgs[0] = "build";