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

Cleanup nits (#5914)

Browse Source
This commit is contained in:
Jack May
2019-09-17 10:21:22 -07:00
committed by GitHub
parent de1636c792
commit c90595cba1
54 changed files with 36 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ci/nits.sh
View File

@ -44,24 +44,3 @@ fi
if _ git --no-pager grep -n 'Default::default()' -- '*.rs'; then if _ git --no-pager grep -n 'Default::default()' -- '*.rs'; then
exit 1 exit 1
fi fi
# Let's keep a .gitignore for every crate, ensure it's got
# /target/ and /farf/ in it
declare gitignores_ok=true
for i in $(git --no-pager ls-files \*/Cargo.toml ); do
dir=$(dirname "$i")
if [[ ! -f $dir/.gitignore ]]; then
echo 'error: nits.sh .gitnore missing for crate '"$dir" >&2
gitignores_ok=false
else
if ! grep -q -e '^/target/$' "$dir"/.gitignore; then
echo 'error: nits.sh "/target/" apparently missing from '"$dir"'/.gitignore' >&2
gitignores_ok=false
fi
if ! grep -q -e '^/farf/$' "$dir"/.gitignore ; then
echo 'error: nits.sh "/farf/" apparently missing from '"$dir"'/.gitignore' >&2
gitignores_ok=false
fi
fi
done
"$gitignores_ok"

4
programs/bpf/rust/128bit/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/128bit/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-128bit" name = "solana-bpf-rust-128bit"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF iter program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_128bit" name = "solana_bpf_rust_128bit"
crate-type = ["cdylib"]

4
programs/bpf/rust/128bit_dep/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

4
programs/bpf/rust/128bit_dep/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-128bit-dep" name = "solana-bpf-rust-128bit-dep"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF many-args-dep program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"

4
programs/bpf/rust/alloc/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/alloc/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-alloc" name = "solana-bpf-rust-alloc"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF alloc program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_alloc" name = "solana_bpf_rust_alloc"
crate-type = ["cdylib"]

4
programs/bpf/rust/dep_crate/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/dep_crate/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-dep-crate" name = "solana-bpf-rust-dep-crate"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF dep-crate program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_dep_crate" name = "solana_bpf_rust_dep_crate"
crate-type = ["cdylib"]

2
programs/bpf/rust/do.sh
View File

@ -25,7 +25,7 @@ targetDir="$PWD"/../target
profile=bpfel-unknown-unknown/release profile=bpfel-unknown-unknown/release
perform_action() { perform_action() {
set -ex set -e
case "$1" in case "$1" in
build) build)
"$sdkDir"/bpf/rust/build.sh "$2" "$sdkDir"/bpf/rust/build.sh "$2"

4
programs/bpf/rust/external_spend/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/external_spend/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-external-spend" name = "solana-bpf-rust-external-spend"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF external spend program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_external_spend" name = "solana_bpf_rust_external_spend"
crate-type = ["cdylib"]

4
programs/bpf/rust/iter/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/iter/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-iter" name = "solana-bpf-rust-iter"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF iter program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_iter" name = "solana_bpf_rust_iter"
crate-type = ["cdylib"]

4
programs/bpf/rust/many_args/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/many_args/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-many-args" name = "solana-bpf-rust-many-args"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF many-args program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_many_args" name = "solana_bpf_rust_many_args"
crate-type = ["cdylib"]

4
programs/bpf/rust/many_args_dep/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

4
programs/bpf/rust/many_args_dep/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-many-args-dep" name = "solana-bpf-rust-many-args-dep"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF many-args-dep program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"

4
programs/bpf/rust/noop/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/noop/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-noop" name = "solana-bpf-rust-noop"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF noop program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_noop" name = "solana_bpf_rust_noop"
crate-type = ["cdylib"]

4
programs/bpf/rust/panic/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

4
programs/bpf/rust/panic/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-panic" name = "solana-bpf-rust-panic"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF iter program written in Rust" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"

4
programs/bpf/rust/param_passing/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

4
programs/bpf/rust/param_passing/Cargo.toml
View File

@ -1,5 +1,5 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-param-passing" name = "solana-bpf-rust-param-passing"
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_param_passing" name = "solana_bpf_rust_param_passing"
crate-type = ["cdylib"]

4
programs/bpf/rust/param_passing_dep/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

2
programs/bpf/rust/param_passing_dep/Cargo.toml
View File

@ -1,5 +1,5 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-param-passing-dep" name = "solana-bpf-rust-param-passing-dep"

4
programs/bpf/rust/sysval/.gitignore vendored
View File

@ -1,4 +0,0 @@
/target/
Cargo.lock
/farf/

6
programs/bpf/rust/sysval/Cargo.toml
View File

@ -1,10 +1,10 @@
# Note: This crate must be built using build.sh # Note: This crate must be built using do.sh
[package] [package]
name = "solana-bpf-rust-sysval" name = "solana-bpf-rust-sysval"
version = "0.19.0-pre0" version = "0.19.0-pre0"
description = "Solana BPF sysvar test" description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
default = ["program"] default = ["program"]
[lib] [lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_sysval" name = "solana_bpf_rust_sysval"
crate-type = ["cdylib"]

2
programs/bpf_loader_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/bpf_loader_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/btc_spv_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/btc_spv_bin/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/btc_spv_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/budget_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/budget_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/config_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/config_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/config_tests/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/exchange_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/exchange_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/failure_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

3
programs/librapay_api/.gitignore vendored
View File

@ -1,3 +0,0 @@
/farf/
/target/
Cargo.lock

3
programs/move_loader_api/.gitignore vendored
View File

@ -1,3 +0,0 @@
/farf/
/target/
Cargo.lock

2
programs/move_loader_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/farf/
/target/

2
programs/noop_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/stake_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/stake_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/stake_tests/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/storage_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/storage_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/token_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/token_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/vote_api/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/

2
programs/vote_program/.gitignore vendored
View File

@ -1,2 +0,0 @@
/target/
/farf/