From 3809f18dc6652e9fd3be1099f52516c1bf325f7f Mon Sep 17 00:00:00 2001 From: Juan Alvarez Date: Sat, 9 Nov 2019 03:54:18 -0600 Subject: [PATCH] update to stable toolchain (#122) * update to stable toolchain * remove toolchan note from routeguide --- README.md | 10 +++++----- rust-toolchain | 1 - tonic-examples/helloworld-tutorial.md | 11 ++++------- tonic-examples/routeguide-tutorial.md | 4 ---- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 rust-toolchain diff --git a/README.md b/README.md index 2aab90edc..8f0d94a4c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 65b2df87f..000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -beta diff --git a/tonic-examples/helloworld-tutorial.md b/tonic-examples/helloworld-tutorial.md index 064436242..2f949f23f 100644 --- a/tonic-examples/helloworld-tutorial.md +++ b/tonic-examples/helloworld-tutorial.md @@ -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 diff --git a/tonic-examples/routeguide-tutorial.md b/tonic-examples/routeguide-tutorial.md index 9c1c33a04..8f5810265 100644 --- a/tonic-examples/routeguide-tutorial.md +++ b/tonic-examples/routeguide-tutorial.md @@ -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