Cleanup nits (#5914)
This commit is contained in:
Jack May
GitHub
parent
de1636c792
commit
c90595cba1
21
ci/nits.sh
21
ci/nits.sh
|
|
@ -44,24 +44,3 @@ fi
|
|||
if _ git --no-pager grep -n 'Default::default()' -- '*.rs'; then
|
||||
exit 1
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-128bit"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_128bit"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-128bit-dep"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -16,4 +16,4 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
|
|||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
default = ["program"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-alloc"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_alloc"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-dep-crate"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_dep_crate"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ targetDir="$PWD"/../target
|
|||
profile=bpfel-unknown-unknown/release
|
||||
|
||||
perform_action() {
|
||||
set -ex
|
||||
set -e
|
||||
case "$1" in
|
||||
build)
|
||||
"$sdkDir"/bpf/rust/build.sh "$2"
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-external-spend"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_external_spend"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-iter"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_iter"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-many-args"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_many_args"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-many-args-dep"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -16,4 +16,4 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
|
|||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
default = ["program"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-noop"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_noop"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-panic"
|
||||
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>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-param-passing"
|
||||
|
|
@ -20,5 +20,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_param_passing"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-param-passing-dep"
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
# Note: This crate must be built using build.sh
|
||||
# Note: This crate must be built using do.sh
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-sysval"
|
||||
version = "0.19.0-pre0"
|
||||
description = "Solana BPF sysvar test"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -19,5 +19,5 @@ program = ["solana-sdk/program"]
|
|||
default = ["program"]
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
name = "solana_bpf_rust_sysval"
|
||||
crate-type = ["cdylib"]
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
/farf/
|
||||
/target/
|
||||
Cargo.lock
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
/farf/
|
||||
/target/
|
||||
Cargo.lock
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/farf/
|
||||
/target/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/target/
|
||||
/farf/
|
||||
Loading…
Reference in New Issue