Skip to content
This repository has been archived by the owner on Oct 14, 2020. It is now read-only.

Update rust version to 1.22.1 #557

Closed
wants to merge 1 commit into from
Closed

Update rust version to 1.22.1 #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Many languages are currently supported in various states of completeness. This l
| R | 3.4.1 | ✓ | | testthat | | | r-runner | | |
| Racket | | ✓ | | | Kumite Only | | func-runner | | |
| Ruby | 2.3.0 | ✓ | ✓ | cw-2, rspec | cw-2 | cw-2, rspec | ruby-runner | cw-2 | |
| Rust | 1.15.1 | ✓ | | rust | rust | | | | |
| Rust | 1.22.1 | ✓ | | rust | rust | | | | |
| Scala | 2.12.3 | ✓ | | junit4,scalatest | | | gradle-runner | | |
| Scss/Sass | | ??? | | ??? | | | | | |
| SQL | SQLite3 | ✓ | ✓ | rspec | | | | | |
Expand Down
2 changes: 1 addition & 1 deletion docker/rust.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM codewars/base-runner
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain 1.15.1; \
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain 1.22.1; \
chmod -R a+w $RUSTUP_HOME $CARGO_HOME;

RUN ln -s /home/codewarrior /workspace
Expand Down
2 changes: 1 addition & 1 deletion lib/runners/rust.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = {
const name = m[1];
const fail = [];
const x = ss[++i];
const m2 = x.match(/thread '[^']+' panicked at '(.+)'.*/);
const m2 = x.match(/thread '[^']+' panicked at '([^]+)'.*/);
if (m2.index != 1) fail.push(x.slice(1, m2.index)); // user logged output
fail.push(`<FAILED::>Test Failed<:LF:>${m2[1].replace(/\\'/g, "'")}`);
failures[name] = fail;
Expand Down
6 changes: 3 additions & 3 deletions test/runners/rust_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ describe('rust runner', function() {
}, function(buffer) {
expect(buffer.stdout).to.contain(`<IT::>returns_sum1_1`);
expect(buffer.stdout).to.contain(`\n<PASSED::>Test Passed`);
expect(buffer.stdout).to.contain(`\n<FAILED::>Test Failed<:LF:>assertion failed: \`(left == right)\` (left: \`"abc\\\\'"\`, right: \`"'\\\\cba"\`)`);
expect(buffer.stdout).to.contain(`\n<FAILED::>Test Failed<:LF:>assertion failed: \`(left == right)\` (left: \`"abc'"\`, right: \`"'cba"\`)`);
expect(buffer.stdout).to.contain(`\n<FAILED::>Test Failed<:LF:>assertion failed: \`(left == right)\` (left: \`1\`, right: \`2\`)`);
expect(buffer.stdout).to.contain(`\n<FAILED::>Test Failed<:LF:>assertion failed: \`(left == right)\`\n left: \`"abc\\\\'"\`,\n right: \`"'\\\\cba"\``);
expect(buffer.stdout).to.contain(`\n<FAILED::>Test Failed<:LF:>assertion failed: \`(left == right)\`\n left: \`"abc'"\`,\n right: \`"'cba"\``);
expect(buffer.stdout).to.contain(`\n<FAILED::>Test Failed<:LF:>assertion failed: \`(left == right)\`\n left: \`1\`,\n right: \`2\``);
done();
});
});
Expand Down