From fc409d9262d865f385ffacebf67af545ba8f9e7f Mon Sep 17 00:00:00 2001
From: Grimes <39311140+solana-grimes@users.noreply.github.com>
Date: Wed, 4 Mar 2020 16:26:32 -0800
Subject: [PATCH] Consistency nits and spelling (#8642)

automerge
---
 programs/bpf/c/src/bench_alu/bench_alu.c         | 1 -
 programs/bpf/c/src/bpf_to_bpf/entrypoint.c       | 1 -
 programs/bpf/c/src/bpf_to_bpf/helper.c           | 1 -
 programs/bpf/c/src/move_funds/move_funds.c       | 1 -
 programs/bpf/c/src/relative_call/relative_call.c | 1 -
 programs/bpf/rust/128bit/src/lib.rs              | 2 +-
 programs/bpf/rust/alloc/src/lib.rs               | 2 +-
 programs/bpf/rust/dep_crate/src/lib.rs           | 2 +-
 programs/bpf/rust/error_handling/src/lib.rs      | 1 -
 programs/bpf/rust/many_args/src/helper.rs        | 1 -
 programs/bpf/rust/noop/src/lib.rs                | 3 +--
 11 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/programs/bpf/c/src/bench_alu/bench_alu.c b/programs/bpf/c/src/bench_alu/bench_alu.c
index 722223f7fb..462b20e4e5 100644
--- a/programs/bpf/c/src/bench_alu/bench_alu.c
+++ b/programs/bpf/c/src/bench_alu/bench_alu.c
@@ -3,7 +3,6 @@
  *
  * Counts Armstrong Numbers between 1 and x
  */
-
 #include <solana_sdk.h>
 
 extern uint64_t entrypoint(const uint8_t *input) {
diff --git a/programs/bpf/c/src/bpf_to_bpf/entrypoint.c b/programs/bpf/c/src/bpf_to_bpf/entrypoint.c
index 4fd6de8bf5..cab840f7f9 100644
--- a/programs/bpf/c/src/bpf_to_bpf/entrypoint.c
+++ b/programs/bpf/c/src/bpf_to_bpf/entrypoint.c
@@ -3,7 +3,6 @@
  * passed to it
  */
 #include <solana_sdk.h>
-
 #include "helper.h"
 
 extern uint64_t entrypoint(const uint8_t *input) {
diff --git a/programs/bpf/c/src/bpf_to_bpf/helper.c b/programs/bpf/c/src/bpf_to_bpf/helper.c
index 9067cf3d3d..a455908d3d 100644
--- a/programs/bpf/c/src/bpf_to_bpf/helper.c
+++ b/programs/bpf/c/src/bpf_to_bpf/helper.c
@@ -3,7 +3,6 @@
  * passed to it
  */
 #include <solana_sdk.h>
-
 #include "helper.h"
 
 void helper_function(void) {
diff --git a/programs/bpf/c/src/move_funds/move_funds.c b/programs/bpf/c/src/move_funds/move_funds.c
index 6b5a8c1699..78076d6857 100644
--- a/programs/bpf/c/src/move_funds/move_funds.c
+++ b/programs/bpf/c/src/move_funds/move_funds.c
@@ -2,7 +2,6 @@
  * @brief Example C-based BPF program that moves funds from one account to
  * another
  */
-
 #include <solana_sdk.h>
 
 /**
diff --git a/programs/bpf/c/src/relative_call/relative_call.c b/programs/bpf/c/src/relative_call/relative_call.c
index 251281b245..96f2788a93 100644
--- a/programs/bpf/c/src/relative_call/relative_call.c
+++ b/programs/bpf/c/src/relative_call/relative_call.c
@@ -1,7 +1,6 @@
 /**
  * @brief test program that generates BPF PC relative call instructions
  */
-
 #include <solana_sdk.h>
 
 void __attribute__ ((noinline)) helper() {
diff --git a/programs/bpf/rust/128bit/src/lib.rs b/programs/bpf/rust/128bit/src/lib.rs
index efd0991311..cbed7d9ff8 100644
--- a/programs/bpf/rust/128bit/src/lib.rs
+++ b/programs/bpf/rust/128bit/src/lib.rs
@@ -53,7 +53,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 #[cfg(test)]
 mod test {
     use super::*;
-    // Pulls in the stubs requried for `info!()`
+    // Pulls in the stubs required for `info!()`
     solana_sdk_bpf_test::stubs!();
 
     #[test]
diff --git a/programs/bpf/rust/alloc/src/lib.rs b/programs/bpf/rust/alloc/src/lib.rs
index 59e647c289..b6d990d414 100644
--- a/programs/bpf/rust/alloc/src/lib.rs
+++ b/programs/bpf/rust/alloc/src/lib.rs
@@ -85,7 +85,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 #[cfg(test)]
 mod test {
     use super::*;
-    // Pulls in the stubs requried for `info!()`
+    // Pulls in the stubs required for `info!()`
     solana_sdk_bpf_test::stubs!();
 
     #[test]
diff --git a/programs/bpf/rust/dep_crate/src/lib.rs b/programs/bpf/rust/dep_crate/src/lib.rs
index d37e749d3d..f7e6d8e568 100644
--- a/programs/bpf/rust/dep_crate/src/lib.rs
+++ b/programs/bpf/rust/dep_crate/src/lib.rs
@@ -20,7 +20,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 #[cfg(test)]
 mod test {
     use super::*;
-    // Pulls in the stubs requried for `info!()`
+    // Pulls in the stubs required for `info!()`
     solana_sdk_bpf_test::stubs!();
 
     #[test]
diff --git a/programs/bpf/rust/error_handling/src/lib.rs b/programs/bpf/rust/error_handling/src/lib.rs
index ddf6889531..dea04e6e57 100644
--- a/programs/bpf/rust/error_handling/src/lib.rs
+++ b/programs/bpf/rust/error_handling/src/lib.rs
@@ -3,7 +3,6 @@
 extern crate solana_sdk;
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
-
 use solana_sdk::{
     account_info::AccountInfo,
     entrypoint,
diff --git a/programs/bpf/rust/many_args/src/helper.rs b/programs/bpf/rust/many_args/src/helper.rs
index f1861cc0e6..c313f6fc67 100644
--- a/programs/bpf/rust/many_args/src/helper.rs
+++ b/programs/bpf/rust/many_args/src/helper.rs
@@ -1,7 +1,6 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
 extern crate solana_sdk;
-
 use solana_sdk::log::*;
 
 pub fn many_args(
diff --git a/programs/bpf/rust/noop/src/lib.rs b/programs/bpf/rust/noop/src/lib.rs
index 4d2ac353b7..b014dfed9d 100644
--- a/programs/bpf/rust/noop/src/lib.rs
+++ b/programs/bpf/rust/noop/src/lib.rs
@@ -3,7 +3,6 @@
 #![allow(unreachable_code)]
 
 extern crate solana_sdk;
-
 use solana_sdk::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info, log::*, pubkey::Pubkey,
 };
@@ -65,7 +64,7 @@ fn process_instruction(
 #[cfg(test)]
 mod test {
     use super::*;
-    // Pulls in the stubs requried for `info!()`
+    // Pulls in the stubs required for `info!()`
     solana_sdk_bpf_test::stubs!();
 
     #[test]