From 28808a0fffd497311dded5b99832719afcabfb07 Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Tue, 3 Aug 2021 22:28:19 +0200 Subject: [PATCH 1/3] Fix serial doctest --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 5c68b41f2..ddf5b6564 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -155,7 +155,7 @@ //! //! fn read(&mut self) -> nb::Result { //! // read the status register -//! let isr = self.usart.isr.read(); +//! let isr = self.usart.sr.read(); //! //! if isr.ore().bit_is_set() { //! // Error: Buffer overrun @@ -164,7 +164,7 @@ //! // omitted: checks for other errors //! else if isr.rxne().bit_is_set() { //! // Data available: read the data register -//! Ok(self.usart.rdr.read().bits() as u8) +//! Ok(self.usart.dr.read().bits() as u8) //! } else { //! // No data available yet //! Err(nb::Error::WouldBlock) From a6514eafabb5c1ce0e55a33bbf1806fcb2f09142 Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Tue, 3 Aug 2021 22:40:58 +0200 Subject: [PATCH 2/3] Require CI tests to pass --- .github/bors.toml | 1 + .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/bors.toml b/.github/bors.toml index 255caf4a7..7999d3bb6 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -6,5 +6,6 @@ status = [ "ci-linux (stable, thumbv6m-none-eabi)", "ci-linux (stable, thumbv7m-none-eabi)", "ci-linux (1.35.0, x86_64-unknown-linux-gnu)", + "ci-linux-test (stable, x86_64-unknown-linux-gnu)", "fmt", ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d738ddccc..7f10361ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ env: RUSTFLAGS: '--deny warnings' jobs: - ci-linux: + ci-linux-test: runs-on: ubuntu-latest strategy: matrix: From 5ba857ec9dd78089845e62d19a005924c46991b0 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Wed, 4 Aug 2021 00:45:52 +0200 Subject: [PATCH 3/3] Update .github/bors.toml Co-authored-by: Adam Greig --- .github/bors.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/bors.toml b/.github/bors.toml index 7999d3bb6..cd9fa23ed 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -6,6 +6,7 @@ status = [ "ci-linux (stable, thumbv6m-none-eabi)", "ci-linux (stable, thumbv7m-none-eabi)", "ci-linux (1.35.0, x86_64-unknown-linux-gnu)", - "ci-linux-test (stable, x86_64-unknown-linux-gnu)", + "ci-linux-test (stable)", + "ci-linux-test (1.36.0, x86_64-unknown-linux-gnu)", "fmt", ]