paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: convert TryFrom error types to &'static str 

Prevents an unnecessary heap allocation when a RegisterPair::try_from() or
Register::try_from() fails.
This commit is contained in:
Rekai Nyangadzayi Musuka 2020-09-04 14:43:19 -05:00
parent 213c5e5cb3
commit 0e3bdb8a2a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/instruction.rs
View File

@ -1165,7 +1165,7 @@ impl From<RegisterPair> for InstrRegisterPair {
} }
impl TryFrom<InstrRegisterPair> for RegisterPair { impl TryFrom<InstrRegisterPair> for RegisterPair {
type Error = String; // FIXME: Proper error type goes here. type Error = &'static str; // FIXME: Proper error type goes here.
fn try_from(pair: InstrRegisterPair) -> Result<Self, Self::Error> { fn try_from(pair: InstrRegisterPair) -> Result<Self, Self::Error> {
match pair { match pair {
@ -1176,10 +1176,10 @@ impl TryFrom<InstrRegisterPair> for RegisterPair {
InstrRegisterPair::SP => Ok(Self::SP), InstrRegisterPair::SP => Ok(Self::SP),
InstrRegisterPair::PC => Ok(Self::PC), InstrRegisterPair::PC => Ok(Self::PC),
InstrRegisterPair::IncrementHL => { InstrRegisterPair::IncrementHL => {
Err("Can not convert InstrRegisterPair::IncrementHL to RegisterPair".to_string()) Err("Can not convert InstrRegisterPair::IncrementHL to RegisterPair")
} }
InstrRegisterPair::DecrementHL => { InstrRegisterPair::DecrementHL => {
Err("Can not convert InstrRegisterPair::DecrementHL to RegisterPair".to_string()) Err("Can not convert InstrRegisterPair::DecrementHL to RegisterPair")
} }
} }
} }
@ -1199,7 +1199,7 @@ enum InstrRegister {
} }
impl TryFrom<Register> for InstrRegister { impl TryFrom<Register> for InstrRegister {
type Error = String; // FIXME: Proper error type goes here type Error = &'static str; // FIXME: Proper error type goes here
fn try_from(register: Register) -> Result<Self, Self::Error> { fn try_from(register: Register) -> Result<Self, Self::Error> {
match register { match register {
@ -1210,7 +1210,7 @@ impl TryFrom<Register> for InstrRegister {
Register::E => Ok(Self::E), Register::E => Ok(Self::E),
Register::H => Ok(Self::H), Register::H => Ok(Self::H),
Register::L => Ok(Self::L), Register::L => Ok(Self::L),
Register::Flag => Err("Can not convert Register::Flag to InstrRegister".to_string()), Register::Flag => Err("Can not convert Register::Flag to InstrRegister"),
} }
} }
} }