Skip to content

Commit b576319

Browse files
bors[bot]eldruin
andauthored
Merge #305
305: Fix serial doctest + require passing tests on bors r=therealprof a=eldruin This escaped CI somehow in #300. Thanks to `@adamgreig` for his help in figuring this out. Now passing the tests is also a requirement for bors. Co-authored-by: Diego Barrios Romero <[email protected]>
2 parents bbdd217 + a6514ea commit b576319

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/bors.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ status = [
66
"ci-linux (stable, thumbv6m-none-eabi)",
77
"ci-linux (stable, thumbv7m-none-eabi)",
88
"ci-linux (1.35.0, x86_64-unknown-linux-gnu)",
9+
"ci-linux-test (stable, x86_64-unknown-linux-gnu)",
910
"fmt",
1011
]

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
RUSTFLAGS: '--deny warnings'
1010

1111
jobs:
12-
ci-linux:
12+
ci-linux-test:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
//!
156156
//! fn read(&mut self) -> nb::Result<u8, Error> {
157157
//! // read the status register
158-
//! let isr = self.usart.isr.read();
158+
//! let isr = self.usart.sr.read();
159159
//!
160160
//! if isr.ore().bit_is_set() {
161161
//! // Error: Buffer overrun
@@ -164,7 +164,7 @@
164164
//! // omitted: checks for other errors
165165
//! else if isr.rxne().bit_is_set() {
166166
//! // Data available: read the data register
167-
//! Ok(self.usart.rdr.read().bits() as u8)
167+
//! Ok(self.usart.dr.read().bits() as u8)
168168
//! } else {
169169
//! // No data available yet
170170
//! Err(nb::Error::WouldBlock)

0 commit comments

Comments
 (0)