From 6dbba86cc63d9029f61e2adc7c6f7227371a6cb9 Mon Sep 17 00:00:00 2001 From: Jack May Date: Tue, 11 Jun 2019 11:42:30 -0700 Subject: [PATCH] Cleanup rust-utils (#4646) automerge --- sdk/bpf/rust-utils/src/{alloc.rs => allocator.rs} | 0 sdk/bpf/rust-utils/src/lib.rs | 4 ++-- sdk/bpf/rust-utils/src/panic.rs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) rename sdk/bpf/rust-utils/src/{alloc.rs => allocator.rs} (100%) diff --git a/sdk/bpf/rust-utils/src/alloc.rs b/sdk/bpf/rust-utils/src/allocator.rs similarity index 100% rename from sdk/bpf/rust-utils/src/alloc.rs rename to sdk/bpf/rust-utils/src/allocator.rs diff --git a/sdk/bpf/rust-utils/src/lib.rs b/sdk/bpf/rust-utils/src/lib.rs index 861b56d1be..54c022f90b 100644 --- a/sdk/bpf/rust-utils/src/lib.rs +++ b/sdk/bpf/rust-utils/src/lib.rs @@ -8,10 +8,10 @@ extern crate compiler_builtins; -pub mod alloc; +pub mod allocator; pub mod entrypoint; pub mod log; pub mod panic; #[global_allocator] -static A: alloc::Allocator = alloc::Allocator; +static A: allocator::Allocator = allocator::Allocator; diff --git a/sdk/bpf/rust-utils/src/panic.rs b/sdk/bpf/rust-utils/src/panic.rs index fddc6aa980..852083dbad 100644 --- a/sdk/bpf/rust-utils/src/panic.rs +++ b/sdk/bpf/rust-utils/src/panic.rs @@ -1,7 +1,5 @@ //! @brief Solana Rust-based BPF program panic handling -use crate::log::*; -use core::fmt::{self, Write}; use core::panic::PanicInfo; #[cfg(not(test))]