Merge #126

126: Upgrade to aligned 0.3 r=adamgreig a=rnestler



Co-authored-by: Raphael Nestler <raphael.nestler@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 5fb6f36..96d4f20 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ repository = "https://github.com/japaric/cortex-m"
 version = "0.5.8"
 
 [dependencies]
-aligned = "0.2.0"
+aligned = "0.3.1"
 bare-metal = "0.2.0"
 volatile-register = "0.2.0"
 
diff --git a/src/itm.rs b/src/itm.rs
index 0e32e3c..4f8dcf8 100644
--- a/src/itm.rs
+++ b/src/itm.rs
@@ -4,7 +4,7 @@
 
 use core::{fmt, mem, ptr, slice};
 
-use aligned::Aligned;
+use aligned::{Aligned, A4};
 
 use peripheral::itm::Stim;
 
@@ -77,7 +77,7 @@ pub fn write_all(port: &mut Stim, buffer: &[u8]) {
 /// # Examples
 ///
 /// ``` ignore
-/// let mut buffer: Aligned<u32, _> = Aligned([0; 14]);
+/// let mut buffer: Aligned<A4, _> = Aligned([0; 14]);
 ///
 /// buffer.copy_from_slice(b"Hello, world!\n");
 ///
@@ -86,7 +86,7 @@ pub fn write_all(port: &mut Stim, buffer: &[u8]) {
 /// // Or equivalently
 /// itm::write_aligned(&itm.stim[0], &Aligned(*b"Hello, world!\n"));
 /// ```
-pub fn write_aligned(port: &mut Stim, buffer: &Aligned<u32, [u8]>) {
+pub fn write_aligned(port: &mut Stim, buffer: &Aligned<A4, [u8]>) {
     unsafe {
         let len = buffer.len();