Skip to content

Commit 76a71e3

Browse files
bors[bot]newAM
andauthored
Merge #419
419: Fix typos r=eldruin a=newAM Co-authored-by: Alex Martens <alex@thinglab.org>
2 parents a55595c + 1960e43 commit 76a71e3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

embedded-can/src/blocking.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ pub trait Can {
1212
/// the transmit buffer.
1313
fn transmit(&mut self, frame: &Self::Frame) -> Result<(), Self::Error>;
1414

15-
/// Blocks until a frame was received or an error occured.
15+
/// Blocks until a frame was received or an error occurred.
1616
fn receive(&mut self) -> Result<Self::Frame, Self::Error>;
1717
}

embedded-can/src/nb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub trait Can {
1717
///
1818
/// # Notes for implementers
1919
///
20-
/// * Frames of equal identifier shall be transmited in FIFO fashion when more
20+
/// * Frames of equal identifier shall be transmitted in FIFO fashion when more
2121
/// than one transmit buffer is available.
2222
/// * When replacing pending frames make sure the frame is not in the process of
2323
/// being send to the bus.

embedded-hal/src/spi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ pub enum ErrorKind {
250250
ModeFault,
251251
/// Received data does not conform to the peripheral configuration
252252
FrameFormat,
253-
/// An error occured while asserting or deasserting the Chip Select pin.
253+
/// An error occurred while asserting or deasserting the Chip Select pin.
254254
ChipSelectFault,
255255
/// A different error occurred. The original error may contain more information.
256256
Other,
@@ -276,7 +276,7 @@ impl core::fmt::Display for ErrorKind {
276276
),
277277
Self::ChipSelectFault => write!(
278278
f,
279-
"An error occured while asserting or deasserting the Chip Select pin"
279+
"An error occurred while asserting or deasserting the Chip Select pin"
280280
),
281281
Self::Other => write!(
282282
f,

0 commit comments

Comments
 (0)