gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove skip-no-mangle entirely (bp #12696) (#12708)

Browse Source 
* Remove skip-no-mangle entirely (#12696)

(cherry picked from commit 41ad3dd8f0)

# Conflicts:
#	account-decoder/Cargo.toml
#	core/Cargo.toml
#	transaction-status/Cargo.toml

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2020-10-09 20:44:50 +00:00
committed by GitHub
parent 41b99b96c0
commit b34ba0fc4e
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account-decoder/Cargo.toml
View File

@ -22,7 +22,7 @@ solana-config-program = { path = "../programs/config", version = "1.3.16" }
solana-sdk = { path = "../sdk", version = "1.3.16" } solana-sdk = { path = "../sdk", version = "1.3.16" }
solana-stake-program = { path = "../programs/stake", version = "1.3.16" } solana-stake-program = { path = "../programs/stake", version = "1.3.16" }
solana-vote-program = { path = "../programs/vote", version = "1.3.16" } solana-vote-program = { path = "../programs/vote", version = "1.3.16" }
spl-token-v2-0 = { package = "spl-token", version = "2.0.6", features = ["skip-no-mangle"] } spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
thiserror = "1.0" thiserror = "1.0"
[package.metadata.docs.rs] [package.metadata.docs.rs]

2
core/Cargo.toml
View File

@ -68,7 +68,7 @@ solana-transaction-status = { path = "../transaction-status", version = "1.3.16"
solana-version = { path = "../version", version = "1.3.16" } solana-version = { path = "../version", version = "1.3.16" }
solana-vote-program = { path = "../programs/vote", version = "1.3.16" } solana-vote-program = { path = "../programs/vote", version = "1.3.16" }
solana-vote-signer = { path = "../vote-signer", version = "1.3.16" } solana-vote-signer = { path = "../vote-signer", version = "1.3.16" }
spl-token-v2-0 = { package = "spl-token", version = "2.0.6", features = ["skip-no-mangle"] } spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
tempfile = "3.1.0" tempfile = "3.1.0"
thiserror = "1.0" thiserror = "1.0"
tokio_01 = { version = "0.1", package = "tokio" } tokio_01 = { version = "0.1", package = "tokio" }

1
sdk/src/entrypoint.rs
View File

@ -36,7 +36,6 @@ pub const SUCCESS: u64 = 0;
macro_rules! entrypoint { macro_rules! entrypoint {
($process_instruction:ident) => { ($process_instruction:ident) => {
/// # Safety /// # Safety
#[cfg(not(feature = "skip-no-mangle"))]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 { pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
let (program_id, accounts, instruction_data) = let (program_id, accounts, instruction_data) =

1
sdk/src/entrypoint_deprecated.rs
View File

@ -37,7 +37,6 @@ pub const SUCCESS: u64 = 0;
macro_rules! entrypoint_deprecated { macro_rules! entrypoint_deprecated {
($process_instruction:ident) => { ($process_instruction:ident) => {
/// # Safety /// # Safety
#[cfg(not(feature = "skip-no-mangle"))]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 { pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
let (program_id, accounts, instruction_data) = let (program_id, accounts, instruction_data) =

4
transaction-status/Cargo.toml
View File

@ -18,8 +18,8 @@ solana-account-decoder = { path = "../account-decoder", version = "1.3.16" }
solana-sdk = { path = "../sdk", version = "1.3.16" } solana-sdk = { path = "../sdk", version = "1.3.16" }
solana-stake-program = { path = "../programs/stake", version = "1.3.16" } solana-stake-program = { path = "../programs/stake", version = "1.3.16" }
solana-vote-program = { path = "../programs/vote", version = "1.3.16" } solana-vote-program = { path = "../programs/vote", version = "1.3.16" }
spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] } spl-memo-v1-0 = { package = "spl-memo", version = "=1.0.7", features = ["skip-no-mangle"] }
spl-token-v2-0 = { package = "spl-token", version = "2.0.6", features = ["skip-no-mangle"] } spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
serde = "1.0.112" serde = "1.0.112"
serde_derive = "1.0.103" serde_derive = "1.0.103"
serde_json = "1.0.56" serde_json = "1.0.56"