From 19d16e75c6b20fd838fdbd0e7f4a6190d1abb3c7 Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Thu, 22 Aug 2019 15:38:46 -0400
Subject: [PATCH] Fix clippy and lint issues in BPF test program (#5607)

* Revert "Add test program for BPF memory corruption bug (#5603)"

This reverts commit 63d62c33c611e74a6c54ba00d350ecedd0073d12.

* Revert "Revert "Add test program for BPF memory corruption bug (#5603)""

This reverts commit 9502082cdaf2be6b28b365be645c52e0f9c7da4d.

* Fix clippy and fmt issues
---
 programs/bpf/rust/stack_bug/src/lib.rs     | 9 ++++-----
 programs/bpf/rust/stack_bug_dep/src/lib.rs | 6 ++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/programs/bpf/rust/stack_bug/src/lib.rs b/programs/bpf/rust/stack_bug/src/lib.rs
index e3adde3c82..322d8c1eb1 100644
--- a/programs/bpf/rust/stack_bug/src/lib.rs
+++ b/programs/bpf/rust/stack_bug/src/lib.rs
@@ -9,14 +9,13 @@ extern crate alloc;
 extern crate solana_sdk_bpf_no_std;
 extern crate solana_sdk_bpf_utils;
 
-use alloc::vec::Vec;
-use solana_sdk_bpf_utils::info;
-use solana_sdk_bpf_utils::entrypoint;
-use solana_sdk_bpf_utils::entrypoint::{SolKeyedAccount, SolClusterInfo};
 use solana_bpf_rust_stack_bug_dep::{InitPollData, PollData};
+use solana_sdk_bpf_utils::entrypoint;
+use solana_sdk_bpf_utils::entrypoint::{SolClusterInfo, SolKeyedAccount};
+use solana_sdk_bpf_utils::info;
 
 entrypoint!(process_instruction);
-fn process_instruction(ka: &mut [SolKeyedAccount], _info: &SolClusterInfo, _data: &[u8]) -> bool {
+fn process_instruction(_ka: &mut [SolKeyedAccount], _info: &SolClusterInfo, _data: &[u8]) -> bool {
     let header = vec![1u8; 6];
     let option_a = vec![1u8; 1];
     let option_b = vec![1u8; 1];
diff --git a/programs/bpf/rust/stack_bug_dep/src/lib.rs b/programs/bpf/rust/stack_bug_dep/src/lib.rs
index 75a2ffdb8a..f91281bcd3 100644
--- a/programs/bpf/rust/stack_bug_dep/src/lib.rs
+++ b/programs/bpf/rust/stack_bug_dep/src/lib.rs
@@ -4,12 +4,10 @@
 #![allow(unused_attributes)]
 
 extern crate alloc;
-#[cfg(not(test))]
-extern crate solana_sdk_bpf_no_std;
 extern crate solana_sdk_bpf_utils;
 
 use alloc::vec::Vec;
-use solana_sdk_bpf_utils::entrypoint::{SolPubkey};
+use solana_sdk_bpf_utils::entrypoint::SolPubkey;
 
 pub struct InitPollData<'a> {
     pub timeout: u32,
@@ -56,7 +54,7 @@ impl<'a> PollData<'a> {
         assert_eq!(init.timeout, 10);
         Self {
             creator_key,
-            last_block: slot + init.timeout as u64,
+            last_block: slot + u64::from(init.timeout),
             header_len: init.header_len,
             header: init.header,
             option_a: PollOptionData {