resolved conflicts

Cargo.lock

@@ -4,29 +4,113 @@
 name = "ansi-parser"
 version = "0.6.5"
 dependencies = [
- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapless",
+ "nom",
+]
+
+[[package]]
+name = "as-slice"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb4d1c23475b74e3672afa8c2be22040b8b7783ad9b461021144ed10a46bb0e6"
+dependencies = [
+ "generic-array 0.12.3",
+ "generic-array 0.13.2",
+ "generic-array 0.14.4",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+
+[[package]]
+name = "generic-array"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
+ "version_check 0.9.2",
+]
+
+[[package]]
+name = "hash32"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "heapless"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
+dependencies = [
+ "as-slice",
+ "generic-array 0.13.2",
+ "hash32",
+ "stable_deref_trait",
 ]
 
 [[package]]
 name = "memchr"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
 
 [[package]]
 name = "nom"
 version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 dependencies = [
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "typenum"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
+
 [[package]]
 name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 
-[metadata]
+[[package]]
-"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
+name = "version_check"
-"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+version = "0.9.2"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"

Cargo.toml

@@ -11,3 +11,8 @@ edition = "2018"
 
 [dependencies]
 nom = "4.2.3"
+heapless = "0.5.6"
+
+[features]
+std = []
+default = ["std"]

README.md

@@ -45,4 +45,8 @@ fn main() {
         }
     }
 }
- ```
+```
+
+# `no_std` support
+
+`no_std` is supported via disabling the `std` feature in your `Cargo.toml`.

src/enums.rs

@@ -1,8 +1,10 @@
 #[cfg(test)]
 mod tests;
 
+use heapless::{Vec, consts::U5};
+
 ///The following are the implemented ANSI escape sequences. More to be added.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum AnsiSequence {
     Escape,
     CursorPos(u32, u32),
@@ -14,7 +16,7 @@ pub enum AnsiSequence {
     CursorRestore,
     EraseDisplay,
     EraseLine,
-    SetGraphicsMode(Vec<u32>),
+    SetGraphicsMode(Vec<u8, U5>),
     SetMode(u8),
     ResetMode(u8),
     HideCursor,
@@ -55,14 +57,15 @@ pub enum AnsiSequence {
     SetTopAndBottom(u32, u32),
 }
 
-use std::fmt::Display;
+use core::fmt::{Display, Formatter, Result as DisplayResult};
 impl Display for AnsiSequence {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn fmt(&self, formatter: &mut Formatter) -> DisplayResult {
         write!(formatter, "\u{1b}")?;
-        
+
         use AnsiSequence::*;
         match self {
-            Escape => write!(formatter, "\u{1b}"),
+            Escape =>
+                write!(formatter, "\u{1b}"),
             CursorPos(line, col) 
                 => write!(formatter, "[{};{}H", line, col),
             CursorUp(amt)
@@ -88,6 +91,8 @@ impl Display for AnsiSequence {
                         1 => write!(formatter, "[{}m", vec[0]),
                         2 => write!(formatter, "[{};{}m", vec[0], vec[1]),
                         3 => write!(formatter, "[{};{};{}m", vec[0], vec[1], vec[2]),
+                        5 => write!(formatter, "[{};{};{};{};{}m", vec[0], vec[1],
+                            vec[2], vec[3], vec[4]),
                         _ => unreachable!()
                     }
                 },
@@ -181,7 +186,7 @@ pub enum Output<'a> {
 }
 
 impl<'a> Display for Output<'a> {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn fmt(&self, formatter: &mut Formatter) -> DisplayResult {
         use Output::*;
         match self {
             TextBlock(txt) => write!(formatter, "{}", txt),

src/lib.rs

@@ -1,4 +1,5 @@
 #![recursion_limit="256"]
+#![cfg_attr(not(any(feature = "std", test)), no_std)]
 
 mod enums;
 mod parsers;
@@ -20,3 +21,4 @@ mod traits;
 
 pub use enums::*;
 pub use traits::*;
+pub use parsers::parse_escape;

src/parsers.rs

@@ -1,9 +1,10 @@
 #[cfg(test)]
 mod tests;
 
-use crate::{AnsiSequence, Output};
+use crate::AnsiSequence;
 
-use std::convert::TryInto;
+use core::convert::TryInto;
+use heapless::Vec;
 use nom::*;
 
 macro_rules! tag_parser {
@@ -105,7 +106,9 @@ named!(
         tag!("[")       >>
         val: parse_int >>
         tag!("m")      >>
-        (AnsiSequence::SetGraphicsMode(vec![val]))
+        val: expr_res!(val.try_into()) >>
+        conv: expr_res!(Vec::from_slice(&[val])) >>
+        (AnsiSequence::SetGraphicsMode(conv))
     )
 );
 
@@ -117,7 +120,13 @@ named!(
         tag!(";")       >>
         val2: parse_int >>
         tag!("m")       >>
-        (AnsiSequence::SetGraphicsMode(vec![val1, val2]))
+        val1: expr_res!(val1.try_into()) >>
+        val2: expr_res!(val2.try_into()) >>
+        conv: expr_res!(Vec::from_slice(&[
+            val1,
+            val2,
+        ])) >>
+        (AnsiSequence::SetGraphicsMode(conv))
     )
 );
 
@@ -131,7 +140,15 @@ named!(
         tag!(";")       >>
         val3: parse_int >>
         tag!("m")       >>
-        (AnsiSequence::SetGraphicsMode(vec![val1, val2, val3]))
+        val1: expr_res!(val1.try_into()) >>
+        val2: expr_res!(val2.try_into()) >>
+        val3: expr_res!(val3.try_into()) >>
+        conv: expr_res!(Vec::from_slice(&[
+            val1,
+            val2,
+            val3,
+        ])) >>
+        (AnsiSequence::SetGraphicsMode(conv))
     )
 );
 
@@ -139,11 +156,10 @@ named!(
     graphics_mode4<&str, AnsiSequence>,
     do_parse!(
         tag!("[m") >>
-        (AnsiSequence::SetGraphicsMode(vec![]))
+        (AnsiSequence::SetGraphicsMode(Vec::new()))
     )
 );
 
-
 named!(
     graphics_mode5<&str, AnsiSequence>,
     do_parse!(
@@ -158,7 +174,19 @@ named!(
         tag!(";")       >>
         val5: parse_int >>
         tag!("m")       >>
-        (AnsiSequence::SetGraphicsMode(vec![val1, val2, val3, val4, val5]))
+        val1: expr_res!(val1.try_into()) >>
+        val2: expr_res!(val2.try_into()) >>
+        val3: expr_res!(val3.try_into()) >>
+        val4: expr_res!(val4.try_into()) >>
+        val5: expr_res!(val5.try_into()) >>
+        conv: expr_res!(Vec::from_slice(&[
+            val1,
+            val2,
+            val3,
+            val4,
+            val5,
+        ])) >>
+        (AnsiSequence::SetGraphicsMode(conv))
     )
 );
 
@@ -177,7 +205,7 @@ named!(
 named!(
     set_mode<&str, AnsiSequence>,
     do_parse!(
-        tag_s!("[=")                        >>
+        tag!("[=")                       >>
         mode: parse_int                  >>
         conv: expr_res!(mode.try_into()) >>
         tag!("h")                        >>
@@ -188,7 +216,7 @@ named!(
 named!(
     reset_mode<&str, AnsiSequence>,
     do_parse!(
-        tag_s!("[=")                        >>
+        tag!("[=")                       >>
         mode: parse_int                  >>
         conv: expr_res!(mode.try_into()) >>
         tag!("l")                        >>
@@ -305,10 +333,10 @@ named!(
 );
 
 named!(
-    pub parse_escape<&str, Output>,
+    pub parse_escape<&str, AnsiSequence>,
     do_parse!(
-        tag_s!("\u{1b}") >>
+        tag!("\u{1b}")    >>
         seq: combined     >>
-        (Output::Escape(seq))
+        (seq)
     )
 );

src/parsers/tests.rs

@@ -1,5 +1,8 @@
-use super::*;
+use crate::{
-use crate::*;
+    enums::{AnsiSequence, Output},
+    parsers::parse_escape,
+    traits::AnsiParser,
+};
 
 use std::fmt::Write;
 
@@ -59,6 +62,7 @@ test_parser!(erase_line,    "\u{1b}[K");
 test_parser!(set_video_mode_a, "\u{1b}[4m");
 test_parser!(set_video_mode_b, "\u{1b}[4;42m");
 test_parser!(set_video_mode_c, "\u{1b}[4;31;42m");
+test_parser!(set_video_mode_d, "\u{1b}[4;31;42;42;42m");
 
 test_parser!(reset_mode, "\u{1b}[=13l");
 test_parser!(set_mode,   "\u{1b}[=7h");

src/traits.rs

@@ -2,19 +2,20 @@ use crate::enums::{Output};
 use crate::parsers::parse_escape;
 
 pub trait AnsiParser {
-    fn ansi_parse<'a>(&'a self) -> AnsiParseIterator<'a>;
+    fn ansi_parse(&self) -> AnsiParseIterator<'_>;
 }
 
 impl AnsiParser for str {
-    fn ansi_parse<'a>(&'a self) -> AnsiParseIterator<'a> {
+    fn ansi_parse(&self) -> AnsiParseIterator<'_> {
         AnsiParseIterator {
             dat: self
         }
     }
 }
 
+#[cfg(any(feature = "std", test))]
 impl AnsiParser for String {
-    fn ansi_parse<'a>(&'a self) -> AnsiParseIterator<'a> {
+    fn ansi_parse(&self) -> AnsiParseIterator<'_> {
         AnsiParseIterator {
             dat: self
         }
@@ -40,7 +41,7 @@ impl<'a> Iterator for AnsiParseIterator<'a> {
 
                 if let Ok(ret) = res {
                     self.dat = &ret.0;
-                    Some(ret.1)
+                    Some(Output::Escape(ret.1))
                 }else{
                     let pos = self.dat[(loc+1)..].find('\u{1b}');
                     if let Some(loc) = pos {