aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2022-05-07 18:00:25 +0000
committerGravatar GitHub <noreply@github.com> 2022-05-07 18:00:25 +0000
commit02def0765036957facc358eed1ecfad0f9365902 (patch)
tree4d7f13a3e200379ce12f0763996cb61481bb6abb
parentd5d50a05faff5d1d0177dcdbd2798f1abc3e57f6 (diff)
parent0a86194be71538db61ae94fc703ed3f77953a790 (diff)
downloadcortex-m-02def0765036957facc358eed1ecfad0f9365902.tar.gz
cortex-m-02def0765036957facc358eed1ecfad0f9365902.tar.zst
cortex-m-02def0765036957facc358eed1ecfad0f9365902.zip
Merge #440
440: Fix typos in cortex-m-rt lib.rs r=newAM a=danbev Co-authored-by: Daniel Bevenius <daniel.bevenius@gmail.com>
-rw-r--r--cortex-m-rt/src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs
index 97540e7..5f8af73 100644
--- a/cortex-m-rt/src/lib.rs
+++ b/cortex-m-rt/src/lib.rs
@@ -34,14 +34,14 @@
//!
//! This crate expects the user, or some other crate, to provide the memory layout of the target
//! device via a linker script named `memory.x`. This section covers the contents of `memory.x`
-//! The `memory.x` file is used by during linking by the `link.x` script provided by this crate.
+//! The `memory.x` file is used during linking by the `link.x` script provided by this crate.
//!
//! ### `MEMORY`
//!
//! The linker script must specify the memory available in the device as, at least, two `MEMORY`
//! regions: one named `FLASH` and one named `RAM`. The `.text` and `.rodata` sections of the
//! program will be placed in the `FLASH` region, whereas the `.bss` and `.data` sections, as well
-//! as the heap,will be placed in the `RAM` region.
+//! as the heap, will be placed in the `RAM` region.
//!
//! ```text
//! /* Linker script for the STM32F103C8T6 */
@@ -444,7 +444,7 @@ use core::arch::global_asm;
use core::fmt;
// HardFault exceptions are bounced through this trampoline which grabs the stack pointer at
-// the time of the exception and passes it to th euser's HardFault handler in r0.
+// the time of the exception and passes it to the user's HardFault handler in r0.
// Depending on the stack mode in EXC_RETURN, fetches stack from either MSP or PSP.
#[cfg(cortex_m)]
global_asm!(