From c51eaa4ffa99659ee5e114aeb3b9e06f789af12d Mon Sep 17 00:00:00 2001 From: Vadim Kaushan Date: Tue, 28 Jan 2020 20:53:24 +0300 Subject: [PATCH] Edition 2018 --- Cargo.toml | 1 + src/lib.rs | 8 +++----- src/spi.rs | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ba780e9..e97d3bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ categories = ["embedded", "hardware-support", "no-std"] keywords = ["embedded-hal-driver", "display", "LCD"] license = "MIT OR Apache-2.0" repository = "https://github.com/yuri91/ili9341-rs" +edition = "2018" [dependencies] diff --git a/src/lib.rs b/src/lib.rs index a2f4bd1..29808ea 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,13 +1,11 @@ #![no_std] -extern crate embedded_hal as hal; - #[cfg(feature = "graphics")] extern crate embedded_graphics; -use hal::blocking::delay::DelayMs; -use hal::blocking::spi::{Write, Transfer}; -use hal::digital::v2::OutputPin; +use embedded_hal::blocking::delay::DelayMs; +use embedded_hal::blocking::spi::{Write, Transfer}; +use embedded_hal::digital::v2::OutputPin; use core::fmt::Debug; use core::iter::IntoIterator; diff --git a/src/spi.rs b/src/spi.rs index 0956ab8..c168074 100644 --- a/src/spi.rs +++ b/src/spi.rs @@ -1,7 +1,7 @@ -use super::hal::blocking::spi; -use super::hal::spi::{Mode, Phase, Polarity}; -use super::hal::digital::v2::OutputPin; -use super::{Interface, Error}; +use embedded_hal::blocking::spi; +use embedded_hal::spi::{Mode, Phase, Polarity}; +use embedded_hal::digital::v2::OutputPin; +use crate::{Interface, Error}; /// SPI mode pub const MODE: Mode = Mode {