Skip to content

Commit 04ee333

Browse files
bors[bot]rnestler
andcommitted
Merge #126
126: Upgrade to aligned 0.3 r=adamgreig a=rnestler Co-authored-by: Raphael Nestler <[email protected]>
2 parents 33d1909 + d8bf195 commit 04ee333

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository = "https://github.com/japaric/cortex-m"
1414
version = "0.5.8"
1515

1616
[dependencies]
17-
aligned = "0.2.0"
17+
aligned = "0.3.1"
1818
bare-metal = "0.2.0"
1919
volatile-register = "0.2.0"
2020

src/itm.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
use core::{fmt, mem, ptr, slice};
66

7-
use aligned::Aligned;
7+
use aligned::{Aligned, A4};
88

99
use peripheral::itm::Stim;
1010

@@ -77,7 +77,7 @@ pub fn write_all(port: &mut Stim, buffer: &[u8]) {
7777
/// # Examples
7878
///
7979
/// ``` ignore
80-
/// let mut buffer: Aligned<u32, _> = Aligned([0; 14]);
80+
/// let mut buffer: Aligned<A4, _> = Aligned([0; 14]);
8181
///
8282
/// buffer.copy_from_slice(b"Hello, world!\n");
8383
///
@@ -86,7 +86,7 @@ pub fn write_all(port: &mut Stim, buffer: &[u8]) {
8686
/// // Or equivalently
8787
/// itm::write_aligned(&itm.stim[0], &Aligned(*b"Hello, world!\n"));
8888
/// ```
89-
pub fn write_aligned(port: &mut Stim, buffer: &Aligned<u32, [u8]>) {
89+
pub fn write_aligned(port: &mut Stim, buffer: &Aligned<A4, [u8]>) {
9090
unsafe {
9191
let len = buffer.len();
9292

0 commit comments

Comments
 (0)