diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-09 12:41:36 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-09 12:41:36 +0000 |
commit | aa5f80aed1464881575fe635557c3965313a7ecf (patch) | |
tree | 2edc7878c7de99bb7a5e618418357fe8d9b9b168 | |
parent | 01836a0f35fa163025c64cabe1d0c34bb4f69c92 (diff) | |
parent | 9bb699b28db69c4c77034055a922a52b0a5c2b20 (diff) |
Merge #3066
3066: Some README fixes/cleanups r=matklad a=flodiebold
Make capitalization more consistent and fix some typos.
Co-authored-by: Florian Diebold <[email protected]>
-rw-r--r-- | README.md | 20 | ||||
-rw-r--r-- | crates/ra_syntax/Cargo.toml | 2 |
2 files changed, 11 insertions, 11 deletions
@@ -2,13 +2,13 @@ | |||
2 | <img src="https://user-images.githubusercontent.com/1711539/72443316-5a79f280-37ae-11ea-858f-035209ece2dd.png" alt="rust-analyzer logo"> | 2 | <img src="https://user-images.githubusercontent.com/1711539/72443316-5a79f280-37ae-11ea-858f-035209ece2dd.png" alt="rust-analyzer logo"> |
3 | </p> | 3 | </p> |
4 | 4 | ||
5 | Rust Analyzer is an **experimental** modular compiler frontend for the Rust | 5 | rust-analyzer is an **experimental** modular compiler frontend for the Rust |
6 | language. It is a part of a larger rls-2.0 effort to create excellent IDE | 6 | language. It is a part of a larger rls-2.0 effort to create excellent IDE |
7 | support for Rust. If you want to get involved, check the rls-2.0 working group: | 7 | support for Rust. If you want to get involved, check the rls-2.0 working group: |
8 | 8 | ||
9 | https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0 | 9 | https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0 |
10 | 10 | ||
11 | Work on the Rust Analyzer is sponsored by | 11 | Work on rust-analyzer is sponsored by |
12 | 12 | ||
13 | [<img src="https://user-images.githubusercontent.com/1711539/58105231-cf306900-7bee-11e9-83d8-9f1102e59d29.png" alt="Ferrous Systems" width="300">](https://ferrous-systems.com/) | 13 | [<img src="https://user-images.githubusercontent.com/1711539/58105231-cf306900-7bee-11e9-83d8-9f1102e59d29.png" alt="Ferrous Systems" width="300">](https://ferrous-systems.com/) |
14 | - [Mozilla](https://www.mozilla.org/en-US/) | 14 | - [Mozilla](https://www.mozilla.org/en-US/) |
@@ -16,17 +16,17 @@ Work on the Rust Analyzer is sponsored by | |||
16 | 16 | ||
17 | ## Language Server Quick Start | 17 | ## Language Server Quick Start |
18 | 18 | ||
19 | Rust Analyzer is a work-in-progress, so you'll have to build it from source, and | 19 | rust-analyzer is a work-in-progress, so you might encounter critical bugs. That |
20 | you might encounter critical bugs. That said, it is complete enough to provide a | 20 | said, it is complete enough to provide a useful IDE experience and some people |
21 | useful IDE experience and some people use it as a daily driver. | 21 | use it as a daily driver. |
22 | 22 | ||
23 | To build rust-analyzer, you need: | 23 | To build rust-analyzer, you need: |
24 | 24 | ||
25 | * latest stable rust for language server itself | 25 | * latest stable Rust for the language server itself |
26 | * latest stable npm and VS Code for VS Code extension | 26 | * latest stable npm and VS Code for VS Code extension |
27 | 27 | ||
28 | To quickly install rust-analyzer with VS Code extension with standard setup | 28 | To quickly install the rust-analyzer language server and VS Code extension with |
29 | (`code` and `cargo` in `$PATH`, etc), use this: | 29 | standard setup (`code` and `cargo` in `$PATH`, etc), use this: |
30 | 30 | ||
31 | ``` | 31 | ``` |
32 | # clone the repo | 32 | # clone the repo |
@@ -44,8 +44,8 @@ cannot start, see [./docs/user](./docs/user). | |||
44 | 44 | ||
45 | ## Documentation | 45 | ## Documentation |
46 | 46 | ||
47 | If you want to **contribute** to rust-analyzer or just curious about how things work | 47 | If you want to **contribute** to rust-analyzer or are just curious about how |
48 | under the hood, check the [./docs/dev](./docs/dev) folder. | 48 | things work under the hood, check the [./docs/dev](./docs/dev) folder. |
49 | 49 | ||
50 | If you want to **use** rust-analyzer's language server with your editor of | 50 | If you want to **use** rust-analyzer's language server with your editor of |
51 | choice, check [./docs/user](./docs/user) folder. It also contains some tips & tricks to help | 51 | choice, check [./docs/user](./docs/user) folder. It also contains some tips & tricks to help |
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index c5a3d1999..83db943fe 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml | |||
@@ -4,7 +4,7 @@ name = "ra_syntax" | |||
4 | version = "0.1.0" | 4 | version = "0.1.0" |
5 | authors = ["rust-analyzer developers"] | 5 | authors = ["rust-analyzer developers"] |
6 | license = "MIT OR Apache-2.0" | 6 | license = "MIT OR Apache-2.0" |
7 | description = "Comment and whitespace preserving parser for the Rust langauge" | 7 | description = "Comment and whitespace preserving parser for the Rust language" |
8 | repository = "https://github.com/rust-analyzer/rust-analyzer" | 8 | repository = "https://github.com/rust-analyzer/rust-analyzer" |
9 | 9 | ||
10 | [lib] | 10 | [lib] |