Use embedded-graphics-core (#3)

rfuest · web-flow · commit 55b0ec112be4 · 2020-12-07T18:31:34.000+01:00
* Use embedded-graphics-core

* Update embedded-graphics-core to 0.1.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Changed
+
+- **(breaking)** [#3](https://github.com/embedded-graphics/tinytga/pull/3) `tinytga` now depends on `embedded-graphics-core` instead of `embedded-graphics`.
+
 ## [Unreleased - `embedded-graphics` repository] - ReleaseDate
 
 > Note: PR numbers from this point onwards are from the old `embedded-graphics/embedded-graphics` repository. New PR numbers above this note refer to PRs in the `embedded-graphics/tinytga` repository.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,14 +19,10 @@ exclude = [
 [badges]
 circle-ci = { repository = "embedded-graphics/tinytga", branch = "master" }
 
+[dependencies]
+embedded-graphics-core = "0.1.1"
+nom = { version = "6.0.1", default-features = false }
+
 [dev-dependencies]
+embedded-graphics = "0.7.0-alpha.2"
 paste = "1.0"
-
-[dependencies.nom]
-version = "5.1.0"
-default-features = false
-
-[dependencies.embedded-graphics]
-# version = "=0.7.0-alpha.1"
-# TODO: Remove when a new e-g alpha is released
-git = "https://github.com/embedded-graphics/embedded-graphics"
diff --git a/src/dynamic_tga.rs b/src/dynamic_tga.rs
@@ -1,5 +1,5 @@
 use core::marker::PhantomData;
-use embedded_graphics::{
+use embedded_graphics_core::{
     pixelcolor::{Gray8, Rgb555, Rgb888},
     prelude::*,
 };
diff --git a/src/footer.rs b/src/footer.rs
@@ -85,7 +85,9 @@ fn parse_footer<'a>(input: &'a [u8]) -> IResult<&[u8], TgaFooter> {
     let footer_start = input
         .len()
         .checked_sub(TGA_FOOTER_LENGTH)
-        .ok_or(nom::Err::Incomplete(Needed::Size(TGA_FOOTER_LENGTH)))?;
+        .ok_or(nom::Err::Incomplete(Needed::Size(
+            NonZeroUsize::new(TGA_FOOTER_LENGTH).unwrap(),
+        )))?;
     let input = &input[footer_start..input.len()];
 
     let (input, extension_area_offset) = offset(input)?;
diff --git a/src/lib.rs b/src/lib.rs
@@ -158,7 +158,7 @@ mod raw_pixels;
 mod raw_tga;
 
 use core::marker::PhantomData;
-use embedded_graphics::prelude::*;
+use embedded_graphics_core::prelude::*;
 
 pub use crate::{
     color_map::ColorMap,
diff --git a/src/pixels.rs b/src/pixels.rs
@@ -1,5 +1,5 @@
 use core::marker::PhantomData;
-use embedded_graphics::prelude::*;
+use embedded_graphics_core::prelude::*;
 
 use crate::RawPixels;
 
diff --git a/src/raw_pixels.rs b/src/raw_pixels.rs
@@ -1,5 +1,5 @@
 use crate::{packet::Packet, raw_tga::RawTga};
-use embedded_graphics::prelude::*;
+use embedded_graphics_core::prelude::*;
 
 /// Iterator over individual TGA pixels.
 ///
diff --git a/src/raw_tga.rs b/src/raw_tga.rs
@@ -1,4 +1,4 @@
-use embedded_graphics::{prelude::*, primitives::Rectangle};
+use embedded_graphics_core::{prelude::*, primitives::Rectangle};
 use nom::{bytes::complete::take, IResult};
 
 use crate::{

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use embedded_graphics::{prelude::*, primitives::Rectangle};`
	`1`	`+use embedded_graphics_core::{prelude::*, primitives::Rectangle};`
`2`	`2`	`use nom::{bytes::complete::take, IResult};`
`3`	`3`
`4`	`4`	`use crate::{`