diff options
| author | Dario Nieuwenhuis <[email protected]> | 2021-03-18 21:50:26 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-18 21:50:26 +0100 |
| commit | c33c9b9aec99913ee04c7e43bf4753e9288d017f (patch) | |
| tree | 6388d51ee187d6c5db2a21e879048a81ff008678 | |
| parent | e912355bb27476b441160c1faa7bdd2bbf3e5594 (diff) | |
| parent | 5ad259620c9abb958ff80c42cb1117be47f8bad1 (diff) | |
Merge pull request #88 from michaelbeaumont/cargo_fmt
Run cargo fmt in CI
| -rw-r--r-- | .github/workflows/rust.yml | 2 | ||||
| -rwxr-xr-x | ci.sh | 2 | ||||
| -rw-r--r-- | embassy/src/io/traits.rs | 1 | ||||
| -rw-r--r-- | embassy/src/io/util/read.rs | 2 | ||||
| -rw-r--r-- | embassy/src/io/util/read_buf.rs | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index cdfe354ce..17b8353e3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml | |||
| @@ -18,7 +18,7 @@ jobs: | |||
| 18 | - uses: actions-rs/toolchain@v1 | 18 | - uses: actions-rs/toolchain@v1 |
| 19 | with: | 19 | with: |
| 20 | toolchain: nightly | 20 | toolchain: nightly |
| 21 | components: rust-src | 21 | components: rust-src, rustfmt |
| 22 | override: true | 22 | override: true |
| 23 | - name: install | 23 | - name: install |
| 24 | run: rustup target add thumbv7em-none-eabi thumbv6m-none-eabi | 24 | run: rustup target add thumbv7em-none-eabi thumbv6m-none-eabi |
| @@ -4,6 +4,8 @@ set -euxo pipefail | |||
| 4 | 4 | ||
| 5 | cd $(dirname $0) | 5 | cd $(dirname $0) |
| 6 | 6 | ||
| 7 | cargo fmt --all -- --check | ||
| 8 | |||
| 7 | # embassy std | 9 | # embassy std |
| 8 | (cd embassy-std-examples; cargo build) | 10 | (cd embassy-std-examples; cargo build) |
| 9 | 11 | ||
diff --git a/embassy/src/io/traits.rs b/embassy/src/io/traits.rs index f1f91a46c..6138adb40 100644 --- a/embassy/src/io/traits.rs +++ b/embassy/src/io/traits.rs | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | |||
| 2 | use core::ops::DerefMut; | 1 | use core::ops::DerefMut; |
| 3 | use core::pin::Pin; | 2 | use core::pin::Pin; |
| 4 | use core::task::{Context, Poll}; | 3 | use core::task::{Context, Poll}; |
diff --git a/embassy/src/io/util/read.rs b/embassy/src/io/util/read.rs index 31aaa0da5..274b43a43 100644 --- a/embassy/src/io/util/read.rs +++ b/embassy/src/io/util/read.rs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | use super::super::error::{Result}; | 1 | use super::super::error::Result; |
| 2 | use super::super::traits::AsyncBufRead; | 2 | use super::super::traits::AsyncBufRead; |
| 3 | 3 | ||
| 4 | use core::cmp::min; | 4 | use core::cmp::min; |
diff --git a/embassy/src/io/util/read_buf.rs b/embassy/src/io/util/read_buf.rs index 7489eac26..71299b05e 100644 --- a/embassy/src/io/util/read_buf.rs +++ b/embassy/src/io/util/read_buf.rs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | use super::super::error::{Result}; | 1 | use super::super::error::Result; |
| 2 | use super::super::traits::AsyncBufRead; | 2 | use super::super::traits::AsyncBufRead; |
| 3 | 3 | ||
| 4 | use core::pin::Pin; | 4 | use core::pin::Pin; |
