Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to stable toolchain #122

Merged
merged 2 commits into from
Nov 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ may be a good resource as it shows examples of many of the gRPC features.

### Rust Version

`tonic` currently works on rust `1.39-beta` and above as it requires support for the `async_await`
feature. To install the beta simply follow the commands below:
`tonic` currently works on rust `1.39` and above as it requires support for the `async_await`
feature.

```bash
$ rustup install beta
$ rustup component add rustfmt --toolchain beta
$ cargo +beta build
$ rustup update
$ rustup component add rustfmt
$ cargo build
```

### Tutorials
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

11 changes: 4 additions & 7 deletions tonic-examples/helloworld-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@ $ cargo new helloworld-tonic
$ cd helloworld-tonic
```

`tonic` currently only works on rust `1.39-beta` and above as it requires support for the `async_await`
feature. To install the beta simply follow the commands below:
`tonic` works on rust `1.39` and above as it requires support for the `async_await`
feature.

```bash
$ rustup install beta
$ rustup component add rustfmt --toolchain beta
$ rustup default beta
$ rustup update
$ rustup component add rustfmt
```

We recommend setting `rustup default` to `beta` as this is the version tools like RLS and rust-analyzer will use to watch your code, and could degrade your experience when developing using Tonic as they will not be able to provide support.

## Defining the HelloWorld service

Our first step is to define the gRPC _service_ and the method _request_ and _response_ types using
Expand Down
4 changes: 0 additions & 4 deletions tonic-examples/routeguide-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ Tonic uses `rustfmt` to tidy up the code it generates, so we'll make sure it's i
$ rustup component add rustfmt
```

**Note** Prior to rust's 1.39 release, Tonic may be pinned to a specific toolchain version. Running
the above command may first download and install a different toolchain. Check the project's [readme]
for the latest requirements.

Run the server
```shell
$ cargo run --bin routeguide-server
Expand Down