From ecb1327fed1ece4083aa09255dbd927c5df304ef Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 27 Jul 2019 14:35:18 +0300 Subject: Overhaul installation process The new commands are $ cargo install-ra --client-code $ cargo install-ra --server --jemalloc --- docs/dev/README.md | 8 ++++---- docs/user/README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/dev/README.md b/docs/dev/README.md index 0a148ed32..74c58d4af 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md @@ -66,7 +66,7 @@ typescript) and Emacs (in elisp). The `docs` top-level directory contains both developer and user documentation. We have some automation infra in Rust in the `crates/tool` package. It contains -stuff like formatting checking, code generation and powers `cargo install-code`. +stuff like formatting checking, code generation and powers `cargo install-ra`. The latter syntax is achieved with the help of cargo aliases (see `.cargo` directory). @@ -84,7 +84,7 @@ However, launching a VS Code instance with locally build language server is possible. There's even a VS Code task for this, so just F5 should work (thanks, [@andrew-w-ross](https://github.com/andrew-w-ross)!). -I often just install development version with `cargo jinstall-lsp` and +I often just install development version with `cargo install-ra --server --jemalloc` and restart the host VS Code. See [./debugging.md](./debugging.md) for how to attach to rust-analyzer with @@ -110,7 +110,7 @@ ways: 2. Run `npm test` from the command line. Although this is initiated from the command line it is not headless; it will also launch a temporary instance of - VS Code. + VS Code. Due to the requirements of running the tests inside VS Code they are **not run on CI**. When making changes to the extension please ensure the tests are not @@ -151,7 +151,7 @@ There's also two VS Code commands which might be of interest: $ cargo install --path crates/ra_lsp_server --force --features jemalloc ``` - There's an alias for this: `cargo jinstall-lsp`. + There's an alias for this: `cargo install-ra --server --jemalloc`. * `Rust Analyzer: Syntax Tree` shows syntax tree of the current file/selection. diff --git a/docs/user/README.md b/docs/user/README.md index 8a5767849..122388a42 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -1,6 +1,6 @@ The main interface to rust-analyzer is the [LSP](https://microsoft.github.io/language-server-protocol/) implementation. To -install lsp server, use `cargo install-lsp`, which is a shorthand for `cargo +install lsp server, use `cargo install-ra --server`, which is a shorthand for `cargo install --package ra_lsp_server`. The binary is named `ra_lsp_server`, you should be able to use it with any LSP-compatible editor. We use custom extensions to LSP, so special client-side support is required to take full @@ -33,7 +33,7 @@ following commands: ``` $ git clone https://github.com/rust-analyzer/rust-analyzer.git --depth 1 $ cd rust-analyzer -$ cargo install-code +$ cargo install-ra ``` The automatic installation is expected to *just work* for common cases, if it -- cgit v1.2.3