Skip to content

Commit

Permalink
Update Rust Toolchain to Latest Nightly (enso-org/ide#1564)
Browse files Browse the repository at this point in the history
Original commit: enso-org/ide@44db830
  • Loading branch information
mwu-tow authored May 20, 2021
1 parent 7ac8ce7 commit e4bf747
Show file tree
Hide file tree
Showing 184 changed files with 2,218 additions and 2,114 deletions.
10 changes: 5 additions & 5 deletions ide/.github/workflows/gui-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2019-11-04
toolchain: nightly-2021-05-12
override: true
- name: Install Prettier
run: npm install --save-dev --save-exact prettier
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2019-11-04
toolchain: nightly-2021-05-12
override: true
- name: Run tests (no WASM)
run: node ./run test --no-wasm --skip-version-validation
Expand All @@ -154,7 +154,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2019-11-04
toolchain: nightly-2021-05-12
override: true
- name: Install wasm-pack (macOS)
env:
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2019-11-04
toolchain: nightly-2021-05-12
override: true
- name: Install wasm-pack (macOS)
env:
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2019-11-04
toolchain: nightly-2021-05-12
override: true
- name: Install wasm-pack (macOS)
env:
Expand Down
2 changes: 1 addition & 1 deletion ide/build/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ commands.test.rust = async function(argv) {
commands.lint = command(`Lint the codebase`)
commands.lint.rust = async function() {
// We run clippy-preview due to https://github.com/rust-lang/rust-clippy/issues/4612
await run_cargo('cargo',['clippy-preview','-Z','unstable-options','--','-D','warnings'])
await run_cargo('cargo',['clippy','--','-D','warnings'])
}


Expand Down
2 changes: 1 addition & 1 deletion ide/build/workflow.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const yaml = require('js-yaml')
// =================

const NODE_VERSION = '14.15.0'
const RUST_VERSION = 'nightly-2019-11-04'
const RUST_VERSION = 'nightly-2021-05-12'
const WASM_PACK_VERSION = '0.9.1'
const FLAG_NO_CHANGELOG_NEEDED = '[ci no changelog needed]'
const FLAG_FORCE_CI_BUILD = '[ci build]'
Expand Down
4 changes: 2 additions & 2 deletions ide/docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ application icon if built on Linux or Windows due to non-trivial icon generation
on these platforms. To develop the source code you will need the following
setup:

- **The Rust Toolchain (nightly-2019-11-04)**
- **The Rust Toolchain (nightly-2021-05-12)**

This project uses several features available only in the nightly Rust
toolchain. Please use the [the Rust toolchain installer](https://rustup.rs) to
install it:

```bash
rustup toolchain install nightly-2019-11-04 # Install the nightly channel.
rustup toolchain install nightly-2021-05-12 # Install the nightly channel.
rustup component add clippy # Install the linter.
cargo +stable install wasm-pack --version 0.9.1 # Install the wasm-pack toolkit.
cargo +stable install cargo-watch # To enable ./run watch utility
Expand Down
2 changes: 1 addition & 1 deletion ide/run
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ async function init () {
console.log("Checking versions of installed packages.")
await cmd.check_version('node',node_lts_version)
await cmd.check_version('npm',npm_lts_version)
await cmd.check_version('rustc','1.40.0-nightly',{
await cmd.check_version('rustc','1.54.0-nightly',{
preprocess:(v)=>v.substring(6,20)
})
}
Expand Down
2 changes: 1 addition & 1 deletion ide/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2019-11-04
nightly-2021-05-12
Loading

0 comments on commit e4bf747

Please sign in to comment.