Skip to content

Commit

Permalink
Merge #3421
Browse files Browse the repository at this point in the history
3421: rust: update nightly apr 2023 r=bradjc a=bradjc

### Pull Request Overview

It has been a little while since we updated the Rust nightly. Looks like there are no changes that impact Tock.


### Testing Strategy

travis


### TODO or Help Wanted

n/a


### Documentation Updated

- [x] Updated the relevant files in `/docs`, or no updates are required.

### Formatting

- [x] Ran `make prepush`.


Co-authored-by: Brad Campbell <bradjc5@gmail.com>
  • Loading branch information
bors[bot] and bradjc committed Apr 25, 2023
2 parents 886ec94 + 472e2f2 commit 23c5604
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"editor.formatOnSave": true,
"rust-client.channel": "nightly-2022-10-22",
"rust-client.channel": "nightly-2023-04-13",
}
4 changes: 2 additions & 2 deletions doc/Getting_Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ of installing some of these tools, but you can also install them yourself.

#### Rust (nightly)

We are using `nightly-2022-10-22`. We require
We are using `nightly-2023-04-13`. We require
installing it with [rustup](http://www.rustup.rs) so you can manage multiple
versions of Rust and continue using stable versions for other Rust code:

Expand All @@ -92,7 +92,7 @@ to your `$PATH`.
Then install the correct nightly version of Rust:

```bash
$ rustup install nightly-2022-10-22
$ rustup install nightly-2023-04-13
```

#### Tockloader
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2022-10-22
nightly-2023-04-13
2 changes: 1 addition & 1 deletion tools/netlify-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set -u
set -x

# Install rust stuff that we need
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2022-10-22
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2023-04-13

# And fixup path for the newly installed rust stuff
export PATH="$PATH:$HOME/.cargo/bin"
Expand Down

0 comments on commit 23c5604

Please sign in to comment.