Skip to content

Commit 692220e

Browse files
committed
use stable, rustfmt-preview and ignore rustfmt errors
1 parent b3f536f commit 692220e

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

.travis.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,26 @@ matrix:
1212
include:
1313
# Nightly, for testing
1414
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Atmel
15-
rust: beta
1615

1716
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Freescale
18-
rust: beta
1917

2018
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Fujitsu
21-
rust: beta
2219

2320
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Holtek
24-
rust: beta
2521

2622
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nordic
27-
rust: beta
2823

2924
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nuvoton
30-
rust: beta
3125

3226
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=NXP
33-
rust: beta
3427

3528
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=SiliconLabs
36-
rust: beta
3729

3830
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Spansion
39-
rust: beta
4031

4132
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=STMicro
42-
rust: beta
4333

4434
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=Toshiba
45-
rust: beta
4635

4736
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER
4837
rust: nightly

ci/install.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ main() {
1919
--git japaric/cross \
2020
--tag $tag
2121

22-
if [ ! -z ${VENDOR-} ]; then
23-
curl -LSfs https://japaric.github.io/trust/install.sh | \
24-
sh -s -- \
25-
--crate rustfmt \
26-
--force \
27-
--git japaric/rustfmt-bin \
28-
--tag v0.8.4-20170605
29-
fi
22+
rustup component add rustfmt-preview
3023
}
3124

3225
main

ci/script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ test_svd() {
1414

1515
mv lib.rs src/lib.rs
1616

17-
rustfmt src/lib.rs
17+
# ignore rustfmt errors
18+
rustfmt src/lib.rs || true
1819
popd
1920

2021
cargo check --manifest-path $td/Cargo.toml

0 commit comments

Comments
 (0)