Skip to content

Commit 4ac1315

Browse files
bors[bot]japaric
andcommitted
Merge #115
115: CI: test on beta r=therealprof a=japaric also recommend readers to use the beta channel r? @rust-embedded/resources (anyone) Co-authored-by: Jorge Aparicio <[email protected]>
2 parents 263dcfb + 6811954 commit 4ac1315

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: rust
2-
rust: nightly
2+
rust: beta
33

44
install:
55
- bash ci/install.sh

src/03-setup/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ Next, follow OS-agnostic installation instructions for a few of the tools:
6767

6868
Install rustup by following the instructions at [https://rustup.rs](https://rustup.rs).
6969

70-
Then, install or switch to the nightly channel.
70+
Then, install or switch to the beta channel.
7171

7272
``` console
73-
$ rustup default nightly
73+
$ rustup default beta
7474
```
7575

76-
**NOTE** Make sure you have a nightly newer than `nightly-2018-09-13`. `rustc -V` should return a
77-
date newer than the one shown below:
76+
**NOTE** Make sure you have a toolchain newer than `1.30-beta.1`. `rustc -V`
77+
should return a date newer than the one shown below:
7878

7979
``` console
8080
$ rustc -V
81-
rustc 1.30.0-nightly (f2302daef 2018-09-12)
81+
rustc 1.30.0-beta.1 (14f51b05d 2018-09-18)
8282
```
8383

8484
### `itmdump`

src/11-usart/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ version = "0.1.0"
66

77
[dependencies]
88
aux11 = { path = "auxiliary" }
9-
heapless = "0.3.6"
9+
10+
[dependencies.heapless]
11+
default-features = false
12+
version = "0.3.7"

0 commit comments

Comments
 (0)