Skip to content

fix unexpected tag #2499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yihau wants to merge 3 commits into from
Closed

fix unexpected tag #2499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b3d65e
fix unexpected tag
yihau Aug 7, 2024
4f1757a
add frozen abi to general config
yihau Aug 9, 2024
5e6cfba
unify format
yihau Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,15 @@ homepage = "https://anza.xyz/"
license = "Apache-2.0"
edition = "2021"

[workspace.lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = [
'cfg(target_os, values("solana"))',
'cfg(feature, values("frozen-abi"))',
'cfg(RUSTC_WITH_SPECIALIZATION)',
'cfg(RUSTC_WITHOUT_SPECIALIZATION)',
]

[workspace.dependencies]
Inflector = "0.11.4"
agave-transaction-view = { path = "transaction-view", version = "=2.1.0" }
Expand Down
3 changes: 3 additions & 0 deletions account-decoder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ spl-pod = { workspace = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions accounts-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,6 @@ harness = false
[[bench]]
name = "bench_lock_accounts"
harness = false

[lints]
workspace = true
3 changes: 3 additions & 0 deletions bloom/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ frozen-abi = [
"dep:solana-frozen-abi-macro",
"solana-sdk/frozen-abi",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions builtins-default-costs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ frozen-abi = [
"dep:solana-frozen-abi",
"solana-vote-program/frozen-abi",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions compute-budget/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ frozen-abi = [
"dep:solana-frozen-abi",
"solana-sdk/frozen-abi",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,6 @@ name = "sigverify_stage"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions cost-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ frozen-abi = [

[[bench]]
name = "cost_tracker"

[lints]
workspace = true
3 changes: 3 additions & 0 deletions curves/bn254/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ array-bytes = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }
serde_json = { workspace = true }

[lints]
workspace = true
3 changes: 3 additions & 0 deletions curves/curve25519/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ solana-program = { workspace = true }

[target.'cfg(not(target_os = "solana"))'.dependencies]
curve25519-dalek = { workspace = true, features = ["serde"] }

[lints]
workspace = true
3 changes: 3 additions & 0 deletions curves/secp256k1-recover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ frozen-abi = ["dep:rustc_version", "dep:solana-frozen-abi", "dep:solana-frozen-a

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
4 changes: 4 additions & 0 deletions define-syscall/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ edition = { workspace = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[workspace.lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(target_feature, values("static-syscalls"))']
3 changes: 3 additions & 0 deletions frozen-abi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ rustc_version = { workspace = true }
default = ["frozen-abi"]
# no reason to deactivate this. It's needed because the build.rs is reused elsewhere
frozen-abi = []

[lints]
workspace = true
3 changes: 3 additions & 0 deletions frozen-abi/macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ rustc_version = { workspace = true }
default = ["frozen-abi"]
# no reason to deactivate this. It's needed because the build.rs is reused elsewhere
frozen-abi = []

[lints]
workspace = true
3 changes: 3 additions & 0 deletions gossip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,6 @@ path = "src/main.rs"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions ledger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,6 @@ name = "blockstore"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
9 changes: 9 additions & 0 deletions perf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,12 @@ name = "discard"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = [
'cfg(build_target_feature_avx)',
'cfg(build_target_feature_avx2)',
'cfg(RUSTC_WITH_SPECIALIZATION)',
'cfg(RUSTC_WITHOUT_SPECIALIZATION)',
]
3 changes: 3 additions & 0 deletions poseidon/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ light-poseidon = { workspace = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions program-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,6 @@ frozen-abi = [
"solana-sdk/frozen-abi",
]
shuttle-test = ["solana-type-overrides/shuttle-test", "solana_rbpf/shuttle-test"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/address-lookup-table/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ name = "solana_address_lookup_table_program"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
4 changes: 4 additions & 0 deletions programs/sbf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ homepage = "https://anza.xyz"
license = "Apache-2.0"
edition = "2021"

[workspace.lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(target_os, values("solana"))']

[workspace.dependencies]
array-bytes = "=1.4.1"
bincode = { version = "1.1.4", default-features = false }
Expand Down
3 changes: 3 additions & 0 deletions programs/sbf/rust/custom_heap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ custom-heap = []

[lib]
crate-type = ["cdylib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/sbf/rust/deprecated_loader/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ solana-program = { workspace = true }

[lib]
crate-type = ["cdylib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/sbf/rust/membuiltins/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ solana-sbf-rust-mem-dep = { workspace = true }

[lib]
crate-type = ["cdylib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/sbf/rust/panic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ custom-panic = []

[lib]
crate-type = ["cdylib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/sbf/rust/ro_modify/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ solana-program = { workspace = true }

[lib]
crate-type = ["cdylib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/sbf/rust/sanity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ solana-program = { workspace = true }

[lib]
crate-type = ["cdylib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/stake/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ name = "solana_stake_program"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions programs/vote/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ frozen-abi = [
"solana-program-runtime/frozen-abi",
"solana-sdk/frozen-abi",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions runtime-transaction/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true, optional = true }

[lints]
workspace = true
3 changes: 3 additions & 0 deletions runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,6 @@ frozen-abi = [

[[bench]]
name = "prioritization_fee_cache"

[lints]
workspace = true
3 changes: 3 additions & 0 deletions sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,6 @@ targets = ["x86_64-unknown-linux-gnu"]

[lib]
crate-type = ["cdylib", "rlib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions sdk/msg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ solana-define-syscall = { workspace = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions sdk/program-memory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]

[target.'cfg(target_os = "solana")'.dependencies]
solana-define-syscall = { workspace = true }

[lints]
workspace = true
3 changes: 3 additions & 0 deletions sdk/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,6 @@ frozen-abi = [
"dep:solana-frozen-abi-macro",
"solana-short-vec/frozen-abi",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions short-vec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ frozen-abi = ["dep:rustc_version", "dep:solana-frozen-abi", "dep:solana-frozen-a

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions svm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,6 @@ shuttle-test = [
"solana-bpf-loader-program/shuttle-test",
"solana-loader-v4-program/shuttle-test",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true, optional = true }

[lints]
workspace = true
3 changes: 3 additions & 0 deletions vote/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ frozen-abi = [
"dep:solana-frozen-abi-macro",
"solana-sdk/frozen-abi",
]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions zk-sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ zeroize = { workspace = true, features = ["zeroize_derive"] }

[lib]
crate-type = ["cdylib", "rlib"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions zk-token-sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ zeroize = { workspace = true, features = ["zeroize_derive"] }

[lib]
crate-type = ["cdylib", "rlib"]

[lints]
workspace = true