Upgrade to rust 1.39.0 (#6939) (#6960)

automerge
This commit is contained in:
mergify[bot]
2019-11-14 12:55:54 -08:00
committed by Grimes
parent f895c3f66d
commit d0de05acaa
13 changed files with 36 additions and 11 deletions

View File

@@ -38,6 +38,8 @@ macro_rules! entrypoint {
}
/// Deserialize the input parameters
///
/// # Safety
#[allow(clippy::type_complexity)]
pub unsafe fn deserialize<'a>(input: *mut u8) -> (&'a Pubkey, Vec<AccountInfo<'a>>, &'a [u8]) {
let mut offset: usize = 0;

View File

@@ -41,7 +41,7 @@ pub fn next_keyed_account<I: Iterator>(iter: &mut I) -> Result<I::Item, Instruct
iter.next().ok_or(InstructionError::NotEnoughAccountKeys)
}
pub fn limited_deserialize<T>(data: &[u8]) -> Result<(T), InstructionError>
pub fn limited_deserialize<T>(data: &[u8]) -> Result<T, InstructionError>
where
T: serde::de::DeserializeOwned,
{