move to v0.2.0 of embedded-hal

Author: japaric

.travis.yml

@@ -1,52 +1,36 @@
-# Based on the "trust" template v0.1.2
-# https://github.com/japaric/trust/tree/v0.1.2
-
 language: rust
-services: docker
 
 matrix:
   include:
-    # Linux
     - env: TARGET=x86_64-unknown-linux-gnu
-      rust: nightly
 
-    # Bare metal
     - env: TARGET=thumbv6m-none-eabi
-      rust: nightly
+      rust: beta
+
     - env: TARGET=thumbv7m-none-eabi
-      rust: nightly
-    - env: TARGET=thumbv7em-none-eabi
-      rust: nightly
-    - env: TARGET=thumbv7em-none-eabihf
-      rust: nightly
+      rust: beta
 
 before_install:
   - set -e
-  - rustup self update
 
 install:
-  - sh ci/install.sh
-  - source ~/.cargo/env || true
+  - bash ci/install.sh
 
 script:
   - bash ci/script.sh
 
 after_script: set +e
 
-cache:
-  cargo: true
-  directories:
-    - $HOME/.xargo
+cache: cargo
 
 before_cache:
   # Travis can't cache files that are not readable by "others"
   - chmod -R a+r $HOME/.cargo
 
 branches:
   only:
-    - auto
-    - master
-    - try
+    - staging
+    - trying
 
 notifications:
   email:

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.2.0] - 2018-05-11
+
+### Changed
+
+- [breaking-change] moved to v0.2.0 of the `embedded-hal` traits
+
 ## [v0.1.2] - 2018-02-19
 
 ### Added
@@ -28,5 +34,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Initial release
 
 [Unreleased]: https://github.com/japaric/l3gd20/compare/v0.1.2...HEAD
+[v0.2.0]: https://github.com/japaric/l3gd20/compare/v0.1.2...v0.2.0
 [v0.1.2]: https://github.com/japaric/l3gd20/compare/v0.1.1...v0.1.2
 [v0.1.1]: https://github.com/japaric/l3gd20/compare/v0.1.0...v0.1.1

Cargo.toml

@@ -7,7 +7,9 @@ keywords = ["embedded-hal-driver", "gyroscope", "MEMS"]
 license = "MIT OR Apache-2.0"
 name = "l3gd20"
 repository = "https://github.com/japaric/l3gd20"
-version = "0.1.2"
+version = "0.2.0"
 
 [dependencies]
-embedded-hal = "0.1.0"
+# embedded-hal = "0.2.0"
+embedded-hal = { git = "https://github.com/japaric/embedded-hal" }
+generic-array = "0.11.0"

bors.toml

@@ -0,0 +1,3 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]

ci/install.sh

@@ -1,21 +1,9 @@
-set -ex
+set -euxo pipefail
 
 main() {
-    # This fetches latest stable release of Xargo
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/xargo \
-                       | cut -d/ -f3 \
-                       | grep -E '^v[0.1.0-9.]+$' \
-                       | sort --version-sort \
-                       | tail -n1)
-
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- \
-           --force \
-           --git japaric/xargo \
-           --tag $tag \
-           --target x86_64-unknown-linux-musl
-
-    rustup component add rust-src
+    if [ $TARGET != x86_64-unknown-linux-gnu ]; then
+        rustup target add $TARGET
+    fi
 }
 
 main

ci/script.sh

@@ -1,16 +1,7 @@
-# This script takes care of testing your crate
-
 set -euxo pipefail
 
 main() {
-    case $TARGET in
-        x86_64-unknown-linux-gnu)
-            cargo check --target $TARGET
-            ;;
-        *)
-            xargo check --target $TARGET
-            ;;
-    esac
+    cargo check --target $TARGET
 }
 
 main

src/lib.rs

@@ -2,27 +2,28 @@
 //!
 //! This driver was built using [`embedded-hal`] traits.
 //!
-//! [`embedded-hal`]: https://docs.rs/embedded-hal/~0.1
+//! [`embedded-hal`]: https://docs.rs/embedded-hal/0.2
 //!
 //! # Examples
 //!
 //! You should find at least one example in the [f3] crate.
 //!
-//! [f3]: https://docs.rs/f3/~0.5
+//! [f3]: https://docs.rs/f3/0.6
 
 #![deny(missing_docs)]
 #![deny(warnings)]
-#![feature(unsize)]
 #![no_std]
 
 extern crate embedded_hal as hal;
+extern crate generic_array;
 
-use core::marker::Unsize;
 use core::mem;
 
+use generic_array::typenum::consts::*;
+use generic_array::{ArrayLength, GenericArray};
 use hal::blocking::spi::{Transfer, Write};
-use hal::spi::{Mode, Phase, Polarity};
 use hal::digital::OutputPin;
+use hal::spi::{Mode, Phase, Polarity};
 
 /// SPI mode
 pub const MODE: Mode = Mode {
@@ -53,7 +54,7 @@ where
 
     /// Temperature measurement + gyroscope measurements
     pub fn all(&mut self) -> Result<Measurements, E> {
-        let bytes: [u8; 9] = self.read_registers(Register::OUT_TEMP)?;
+        let bytes: GenericArray<u8, U9> = self.read_registers(Register::OUT_TEMP)?;
 
         Ok(Measurements {
             gyro: I16x3 {
@@ -67,7 +68,7 @@ where
 
     /// Gyroscope measurements
     pub fn gyro(&mut self) -> Result<I16x3, E> {
-        let bytes: [u8; 7] = self.read_registers(Register::OUT_X_L)?;
+        let bytes: GenericArray<u8, U7> = self.read_registers(Register::OUT_X_L)?;
 
         Ok(I16x3 {
             x: (bytes[1] as u16 + ((bytes[2] as u16) << 8)) as i16,
@@ -144,13 +145,13 @@ where
         Ok(buffer[1])
     }
 
-    fn read_registers<B>(&mut self, reg: Register) -> Result<B, E>
+    fn read_registers<N>(&mut self, reg: Register) -> Result<GenericArray<u8, N>, E>
     where
-        B: Unsize<[u8]>,
+        N: ArrayLength<u8>,
     {
         self.cs.set_low();
 
-        let mut buffer: B = unsafe { mem::uninitialized() };
+        let mut buffer: GenericArray<u8, N> = unsafe { mem::uninitialized() };
         {
             let slice: &mut [u8] = &mut buffer;
             slice[0] = reg.addr() | MULTI | READ;