Upgrade to Rust v1.49.0

This commit is contained in:
Michael Vines
2021-01-23 11:55:15 -08:00
parent 7604edb16f
commit cbffab7850
36 changed files with 156 additions and 132 deletions

View File

@ -950,6 +950,17 @@ impl<T> From<Option<T>> for COption<T> {
}
}
#[rustversion::since(1.49.0)]
impl<T> From<COption<T>> for Option<T> {
fn from(coption: COption<T>) -> Self {
match coption {
COption::Some(value) => Some(value),
COption::None => None,
}
}
}
#[rustversion::before(1.49.0)] // Remove `Into` once the BPF toolchain upgrades to 1.49.0 or newer
impl<T> Into<Option<T>> for COption<T> {
fn into(self) -> Option<T> {
match self {

View File

@ -43,7 +43,7 @@ pub trait Pack: Sealed {
if input.len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
Ok(Self::unpack_from_slice(input)?)
Self::unpack_from_slice(input)
}
/// Pack into slice