From 40dd46680ec1d845ab742e98e85be330ee438511 Mon Sep 17 00:00:00 2001 From: Jack May Date: Mon, 30 Nov 2020 13:16:37 -0800 Subject: [PATCH] Cleanup bpf test's Cargo.toml files (#13867) * Cleanup bpf test's Cargo.toml files * lock file --- programs/bpf/Cargo.lock | 2 +- programs/bpf/rust/128bit/Cargo.toml | 1 - programs/bpf/rust/alloc/Cargo.toml | 1 - programs/bpf/rust/call_depth/Cargo.toml | 1 - programs/bpf/rust/custom_heap/Cargo.toml | 1 - programs/bpf/rust/dep_crate/Cargo.toml | 1 - programs/bpf/rust/deprecated_loader/Cargo.toml | 3 +-- programs/bpf/rust/dup_accounts/Cargo.toml | 1 - programs/bpf/rust/error_handling/Cargo.toml | 1 - programs/bpf/rust/external_spend/Cargo.toml | 1 - programs/bpf/rust/instruction_introspection/Cargo.toml | 1 - programs/bpf/rust/invoke/Cargo.toml | 1 - programs/bpf/rust/invoked/Cargo.toml | 3 --- programs/bpf/rust/iter/Cargo.toml | 1 - programs/bpf/rust/many_args/Cargo.toml | 1 - programs/bpf/rust/mem/Cargo.toml | 1 - programs/bpf/rust/noop/Cargo.toml | 1 - programs/bpf/rust/panic/Cargo.toml | 1 - programs/bpf/rust/param_passing/Cargo.toml | 1 - programs/bpf/rust/rand/Cargo.toml | 1 - programs/bpf/rust/ristretto/Cargo.toml | 1 - programs/bpf/rust/sanity/Cargo.toml | 1 - programs/bpf/rust/sha256/Cargo.toml | 1 - programs/bpf/rust/sysval/Cargo.toml | 1 - 24 files changed, 2 insertions(+), 27 deletions(-) diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 805c5bd568..f5fe681f19 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1932,7 +1932,7 @@ dependencies = [ ] [[package]] -name = "solana-bpf-rust-deprecated_loader" +name = "solana-bpf-rust-deprecated-loader" version = "1.5.0" dependencies = [ "solana-program", diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml index 9343e0c398..8574b29b42 100644 --- a/programs/bpf/rust/128bit/Cargo.toml +++ b/programs/bpf/rust/128bit/Cargo.toml @@ -13,7 +13,6 @@ solana-program = { path = "../../../../sdk/program", version = "1.5.0" } solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.5.0" } [lib] -name = "solana_bpf_rust_128bit" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml index 62a6eadd21..ef8bc48459 100644 --- a/programs/bpf/rust/alloc/Cargo.toml +++ b/programs/bpf/rust/alloc/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_alloc" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/call_depth/Cargo.toml b/programs/bpf/rust/call_depth/Cargo.toml index 0b7871db50..cac868aa7c 100644 --- a/programs/bpf/rust/call_depth/Cargo.toml +++ b/programs/bpf/rust/call_depth/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_call_depth" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/custom_heap/Cargo.toml b/programs/bpf/rust/custom_heap/Cargo.toml index 31122b7518..28e4234477 100644 --- a/programs/bpf/rust/custom_heap/Cargo.toml +++ b/programs/bpf/rust/custom_heap/Cargo.toml @@ -16,7 +16,6 @@ default = ["custom-heap"] custom-heap = [] [lib] -name = "solana_bpf_rust_custom_heap" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml index 1e40624dbb..38432fe934 100644 --- a/programs/bpf/rust/dep_crate/Cargo.toml +++ b/programs/bpf/rust/dep_crate/Cargo.toml @@ -13,7 +13,6 @@ byteorder = { version = "1", default-features = false } solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_dep_crate" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/deprecated_loader/Cargo.toml b/programs/bpf/rust/deprecated_loader/Cargo.toml index ba94ecb3b8..d0d33b4214 100644 --- a/programs/bpf/rust/deprecated_loader/Cargo.toml +++ b/programs/bpf/rust/deprecated_loader/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "solana-bpf-rust-deprecated_loader" +name = "solana-bpf-rust-deprecated-loader" version = "1.5.0" description = "Solana BPF test program written in Rust" authors = ["Solana Maintainers "] @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_deprecated_loader" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml index 6a30ac2ad0..2dd31c5897 100644 --- a/programs/bpf/rust/dup_accounts/Cargo.toml +++ b/programs/bpf/rust/dup_accounts/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_dup_accounts" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml index 31e5ad2eaf..32de63ecd7 100644 --- a/programs/bpf/rust/error_handling/Cargo.toml +++ b/programs/bpf/rust/error_handling/Cargo.toml @@ -15,7 +15,6 @@ solana-program = { path = "../../../../sdk/program", version = "1.5.0" } thiserror = "1.0" [lib] -name = "solana_bpf_rust_error_handling" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml index f40f5a516c..351982d596 100644 --- a/programs/bpf/rust/external_spend/Cargo.toml +++ b/programs/bpf/rust/external_spend/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_external_spend" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/instruction_introspection/Cargo.toml b/programs/bpf/rust/instruction_introspection/Cargo.toml index d4be3804e9..1d7895123e 100644 --- a/programs/bpf/rust/instruction_introspection/Cargo.toml +++ b/programs/bpf/rust/instruction_introspection/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_instruction_introspection" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml index dbe447ab53..ea532e919f 100644 --- a/programs/bpf/rust/invoke/Cargo.toml +++ b/programs/bpf/rust/invoke/Cargo.toml @@ -13,7 +13,6 @@ solana-bpf-rust-invoked = { path = "../invoked", default-features = false } solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_invoke" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml index 1e32020992..de7df73e85 100644 --- a/programs/bpf/rust/invoked/Cargo.toml +++ b/programs/bpf/rust/invoked/Cargo.toml @@ -1,5 +1,3 @@ - - [package] name = "solana-bpf-rust-invoked" version = "1.5.0" @@ -18,7 +16,6 @@ default = ["program"] program = [] [lib] -name = "solana_bpf_rust_invoked" crate-type = ["lib", "cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml index b9e9594788..cd745f8cc4 100644 --- a/programs/bpf/rust/iter/Cargo.toml +++ b/programs/bpf/rust/iter/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_iter" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml index 4528b10a6f..c0cdf4e9ab 100644 --- a/programs/bpf/rust/many_args/Cargo.toml +++ b/programs/bpf/rust/many_args/Cargo.toml @@ -13,7 +13,6 @@ solana-program = { path = "../../../../sdk/program", version = "1.5.0" } solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.5.0" } [lib] -name = "solana_bpf_rust_many_args" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/mem/Cargo.toml b/programs/bpf/rust/mem/Cargo.toml index ede855de81..b2f511670f 100644 --- a/programs/bpf/rust/mem/Cargo.toml +++ b/programs/bpf/rust/mem/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_mem" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml index b406f6d32e..252335e639 100644 --- a/programs/bpf/rust/noop/Cargo.toml +++ b/programs/bpf/rust/noop/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_noop" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml index 7f6dcb2185..f105fba244 100644 --- a/programs/bpf/rust/panic/Cargo.toml +++ b/programs/bpf/rust/panic/Cargo.toml @@ -16,7 +16,6 @@ default = ["custom-panic"] custom-panic = [] [lib] -name = "solana_bpf_rust_panic" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml index 876d859f50..c5b7cc788f 100644 --- a/programs/bpf/rust/param_passing/Cargo.toml +++ b/programs/bpf/rust/param_passing/Cargo.toml @@ -13,7 +13,6 @@ solana-program = { path = "../../../../sdk/program", version = "1.5.0" } solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.5.0" } [lib] -name = "solana_bpf_rust_param_passing" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/rand/Cargo.toml b/programs/bpf/rust/rand/Cargo.toml index 2a2007ee8d..794fdcaff7 100644 --- a/programs/bpf/rust/rand/Cargo.toml +++ b/programs/bpf/rust/rand/Cargo.toml @@ -14,7 +14,6 @@ rand = "0.7" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_rand" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/ristretto/Cargo.toml b/programs/bpf/rust/ristretto/Cargo.toml index e8bd4a6b04..e7cdf814c6 100644 --- a/programs/bpf/rust/ristretto/Cargo.toml +++ b/programs/bpf/rust/ristretto/Cargo.toml @@ -14,7 +14,6 @@ getrandom = { version = "0.1.14", features = ["dummy"] } solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_ristretto" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/sanity/Cargo.toml b/programs/bpf/rust/sanity/Cargo.toml index 86fce2016b..d9cd129dfc 100644 --- a/programs/bpf/rust/sanity/Cargo.toml +++ b/programs/bpf/rust/sanity/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_sanity" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/sha256/Cargo.toml b/programs/bpf/rust/sha256/Cargo.toml index bac55612c0..c671e1a466 100644 --- a/programs/bpf/rust/sha256/Cargo.toml +++ b/programs/bpf/rust/sha256/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_sha256" crate-type = ["cdylib"] [package.metadata.docs.rs] diff --git a/programs/bpf/rust/sysval/Cargo.toml b/programs/bpf/rust/sysval/Cargo.toml index 70f85f4101..6dafe52de7 100644 --- a/programs/bpf/rust/sysval/Cargo.toml +++ b/programs/bpf/rust/sysval/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" solana-program = { path = "../../../../sdk/program", version = "1.5.0" } [lib] -name = "solana_bpf_rust_sysval" crate-type = ["cdylib"] [package.metadata.docs.rs]