From 90e0982fda840be2b882a19fab08c99f03136f75 Mon Sep 17 00:00:00 2001 From: Rahix Date: Sun, 26 May 2019 10:42:26 +0100 Subject: [PATCH] Use nightly rustfmt Signed-off-by: Rahix --- Makefile | 2 +- README.md | 2 +- build.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 126ce9d..251dc6f 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ src/devices/%/mod.rs: src/devices/%/mod.full.rs @RUST_LOG=WARN form -i $< -o $(@D) >/dev/null @rm $< @mv $(@D)/lib.rs $@ - @rustfmt $@ + @RUSTUP_TOOLCHAIN=nightly rustfmt $@ @# Remove the `extern crate` lines @sed -i'' -e "1,7d" $@ @# Make DEVICE_PERIPHERALS visible crate-wide diff --git a/README.md b/README.md index 9b74d68..3134092 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ avr-device Auto-generated wrappers around registers for avr chips. ## Usage -You need to have [atdf2svd](https://github.com/Rahix/atdf2svd), [svd2rust](https://github.com/rust-embedded/svd2rust), [form](https://github.com/djmcgill/form), [rustfmt](https://github.com/rust-lang/rustfmt) and [PyYAML](https://github.com/yaml/pyyaml) installed: +You need to have [atdf2svd](https://github.com/Rahix/atdf2svd), [svd2rust](https://github.com/rust-embedded/svd2rust), [form](https://github.com/djmcgill/form), [rustfmt](https://github.com/rust-lang/rustfmt)(for the *nightly* toolchain) and [PyYAML](https://github.com/yaml/pyyaml) installed: ```bash rustup component add rustfmt cargo install form diff --git a/build.rs b/build.rs index 23d9c25..9e1cb91 100644 --- a/build.rs +++ b/build.rs @@ -11,7 +11,7 @@ avr-device: Running `make` resulted in a failure. - atdf2svd - svd2rust - form - - rustfmt (for the toolchain you are using!) + - rustfmt (for the nightly toolchain!) - PyYAML For more info, look at README file: -- 2.48.1