Compare commits
1 commit
ac08d4d3a4
...
6508fe03e2
Author | SHA1 | Date | |
---|---|---|---|
6508fe03e2 |
1 changed files with 4 additions and 4 deletions
|
@ -11,7 +11,7 @@ trait Pattern<'a> {
|
||||||
fn parse(args: Vec<String>) -> Result<Self, ParseError>;
|
fn parse(args: Vec<String>) -> Result<Self, ParseError>;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<Vec<String>> for Box<dyn Pattern> {
|
impl<'a> TryFrom<Vec<String>> for Box<dyn Pattern<'a>> {
|
||||||
fn try_from(s: Vec<String>) -> Result<Self, ParseError> {
|
fn try_from(s: Vec<String>) -> Result<Self, ParseError> {
|
||||||
match s[0].as_str() {
|
match s[0].as_str() {
|
||||||
"unit" => Unit::parse(s),
|
"unit" => Unit::parse(s),
|
||||||
|
@ -22,7 +22,7 @@ impl TryFrom<Vec<String>> for Box<dyn Pattern> {
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Unit;
|
struct Unit;
|
||||||
impl<'a> Pattern for Unit<'a> {
|
impl<'a> Pattern<'a> for Unit {
|
||||||
fn execute(&self, values: &'a mut [RawColor]) {}
|
fn execute(&self, values: &'a mut [RawColor]) {}
|
||||||
fn parse(args: Vec<String>) -> Result<Self, ParseError> {
|
fn parse(args: Vec<String>) -> Result<Self, ParseError> {
|
||||||
Ok(Unit {})
|
Ok(Unit {})
|
||||||
|
@ -35,7 +35,7 @@ struct Value {
|
||||||
b: Option<u8>
|
b: Option<u8>
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Pattern for Value<'a> {
|
impl<'a> Pattern<'a> for Value {
|
||||||
fn execute(&self, values: &'a mut [RawColor]) {
|
fn execute(&self, values: &'a mut [RawColor]) {
|
||||||
for i in 0..crate::LED_SIZE {
|
for i in 0..crate::LED_SIZE {
|
||||||
let color: RawColor = values[i];
|
let color: RawColor = values[i];
|
||||||
|
@ -93,7 +93,7 @@ impl<'a> Pattern for Value<'a> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_line(v: Vec<String>) -> Result<Box<dyn Pattern>, ParseError> {
|
pub fn parse_line(v: Vec<String>) -> Result<Box<dyn Pattern<'static>>, ParseError> {
|
||||||
let res: Result<Box<dyn Pattern>, ParseError> = v.try_into();
|
let res: Result<Box<dyn Pattern>, ParseError> = v.try_into();
|
||||||
res
|
res
|
||||||
}
|
}
|
Loading…
Reference in a new issue