Skip to content

Commit

Permalink
[Cargo.toml] Format all Cargo.toml files and enable the formatter!
Browse files Browse the repository at this point in the history 
Closes: aptos-labs#897
  • Loading branch information
@JoshLind @aptos-bot
JoshLind authored and aptos-bot committed May 10, 2022
1 parent 4e3338e commit 5d91e05
Show file tree
Hide file tree
Showing 100 changed files with 463 additions and 460 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ jobs:
- run: cargo x lint
- run: cargo xclippy --workspace --all-targets
- run: cargo xfmt --check
# TODO(joshlind): turn this on for all workspace dependencies! We only do one now as a proof of concept.
- run: cargo sort --grouped --check state-sync/aptos-data-client/
# Temporary workaround for unsorted hakari generated Cargo files (https://github.com/DevinR528/cargo-sort/issues/38).
- run: cargo sort --grouped crates/aptos-workspace-hack
- run: cargo sort --grouped --check --workspace
e2e-test:
executor: ubuntu-2xl
steps:
Expand Down
12 changes: 6 additions & 6 deletions api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,36 @@ fail = "0.5.0"
futures = "0.3.12"
hex = "0.4.3"
hyper = "0.14.18"
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features = ["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
once_cell = "1.10.0"
percent-encoding = "2.1.0"
serde = { version = "1.0.137", features = ["derive"], default-features = false }
serde_json = "1.0.81"
tokio = { version = "1.8.1", features = ["full"] }
warp = { version = "0.3.2", features = ["default", "tls"] }

aptos-api-types = { path = "./types", package = "aptos-api-types" }
aptos-config = { path = "../config" }
aptos-crypto = { path = "../crates/aptos-crypto" }
aptos-logger = { path = "../crates/aptos-logger" }
aptos-mempool = { path = "../mempool"}
aptos-mempool = { path = "../mempool" }
aptos-metrics = { path = "../crates/aptos-metrics" }
aptos-state-view = { path = "../storage/state-view" }
aptos-types = { path = "../types" }
aptos-vm = { path = "../aptos-move/aptos-vm" }
aptos-workspace-hack = { path = "../crates/aptos-workspace-hack" }
aptos-api-types = { path = "./types", package = "aptos-api-types" }
storage-interface = { path = "../storage/storage-interface" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }

[dev-dependencies]
goldenfile = "1.1.0"
move-package = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
rand = "0.8.3"
regex = "1.5.5"
reqwest = { version = "0.11.10", features = ["blocking", "json"], default_features = false }

aptos-crypto = { path = "../crates/aptos-crypto" }
aptos-genesis-tool = {path = "../config/management/genesis", features = ["testing"] }
aptos-genesis-tool = { path = "../config/management/genesis", features = ["testing"] }
aptos-global-constants = { path = "../config/global-constants" }
aptos-mempool = { path = "../mempool", features = ["fuzzing"] }
aptos-sdk = { path = "../sdk" }
Expand All @@ -57,7 +58,6 @@ cached-framework-packages = { path = "../aptos-move/framework/cached-packages" }
executor = { path = "../execution/executor" }
executor-types = { path = "../execution/executor-types" }
mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" }
move-package = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
vm-validator = { path = "../vm-validator" }

[features]
Expand Down
6 changes: 3 additions & 3 deletions api/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ edition = "2018"
anyhow = "1.0.57"
bcs = "0.1.3"
hex = "0.4.3"
move-binary-format = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features = ["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
serde = { version = "1.0.137", default-features = false }
serde_json = "1.0.81"
warp = { version = "0.3.2", features = ["default"] }
Expand All @@ -23,9 +26,6 @@ aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
aptos-types = { path = "../../types" }
aptos-vm = { path = "../../aptos-move/aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }

[dev-dependencies]
move-binary-format = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
2 changes: 1 addition & 1 deletion aptos-move/af-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clap = "3.1.8"
aptos-vm = { path = "../aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
cached-framework-packages = { path = "../framework/cached-packages" }
move-deps = { path = "../move-deps", features=["address32"] }
move-deps = { path = "../move-deps", features = ["address32"] }

[dev-dependencies]
datatest-stable = "0.1.1"
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-keygen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ publish = false
edition = "2018"

[dependencies]
rand = "0.8.3"
hex = "0.4.3"
rand = "0.8.3"

aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-types = { path = "../../types" }
Expand Down
8 changes: 4 additions & 4 deletions aptos-move/aptos-resource-viewer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.57"

aptos-types = { path = "../../types" }
aptos-vm = { path = "../../aptos-move/aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-types = { path = "../../types" }
move-deps = { path = "../move-deps", features=["address32"] }

anyhow = "1.0.57"
move-deps = { path = "../move-deps", features = ["address32"] }
13 changes: 6 additions & 7 deletions aptos-move/aptos-transaction-benchmarks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@ edition = "2018"

[dependencies]
criterion = "0.3.5"
proptest = "1.0.0"
criterion-cpu-time = "0.1.0"
num_cpus = "1.13.1"

aptos-types = { path = "../../types", features = ["fuzzing"] }
language-e2e-tests = { path = "../e2e-tests" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-crypto = { path = "../../crates/aptos-crypto" }

proptest = "1.0.0"
read-write-set = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }

aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-types = { path = "../../types", features = ["fuzzing"] }
aptos-vm = { path = "../aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
language-e2e-tests = { path = "../e2e-tests" }

[[bench]]
name = "transaction_benches"
Expand Down
7 changes: 4 additions & 3 deletions aptos-move/aptos-validator-interface/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ edition = "2018"

[dependencies]
anyhow = "1.0.57"

aptos-config = { path = "../../config" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-types = { path = "../../types" }
aptosdb = { path = "../../storage/aptosdb" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
storage-interface = { path = "../../storage/storage-interface" }
aptos-state-view = { path = "../../storage/state-view" }
aptosdb = { path = "../../storage/aptosdb" }
move-deps = { path = "../move-deps" }
storage-interface = { path = "../../storage/storage-interface" }
12 changes: 6 additions & 6 deletions aptos-move/aptos-vm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ anyhow = "1.0.57"
bcs = "0.1.3"
fail = "0.5.0"
mirai-annotations = "1.12.0"
num_cpus = "1.13.1"
once_cell = "1.10.0"
rayon = "1.5.2"
serde = { version = "1.0.137", default-features = false }
serde_json = "1.0.81"
tracing = "0.1.34"
num_cpus = "1.13.1"

move-deps = { path = "../move-deps", features=["address32"] }
aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" }
aptos-logger = { path = "../../crates/aptos-logger" }
aptos-metrics = { path = "../../crates/aptos-metrics" }
aptos-parallel-executor = {path = "../parallel-executor" }
aptos-parallel-executor = { path = "../parallel-executor" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-types = { path = "../../types" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
framework = { path = "../framework" }
move-deps = { path = "../move-deps", features = ["address32"] }
mvhashmap = { path = "../mvhashmap" }
serde_json = "1.0.81"
serde = { version = "1.0.137", default-features = false }

[dev-dependencies]
proptest = "1.0.0"
Expand All @@ -41,5 +41,5 @@ aptos-types = { path = "../../types", features = ["fuzzing"] }
[features]
default = []
mirai-contracts = []
fuzzing = ["move-deps/fuzzing","move-deps/fuzzing"]
fuzzing = ["move-deps/fuzzing", "move-deps/fuzzing"]
failpoints = ["fail/failpoints", "move-deps/failpoints"]
19 changes: 7 additions & 12 deletions aptos-move/e2e-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,23 @@ anyhow = "1.0.57"
bcs = "0.1.3"
goldenfile = "1.1.0"
hex = "0.4.3"
num_cpus = "1.13.1"
once_cell = "1.10.0"
proptest = "1.0.0"
proptest-derive = "0.3.0"
rand = "0.8.3"
serde = { version = "1.0.137", default-features = false }
num_cpus = "1.13.1"

## Move dependencies
move-deps= { path = "../move-deps", features=["address32"] }

## Aptos-Move dependencies
aptos-keygen = { path = "../aptos-keygen" }
aptos-vm = { path = "../aptos-vm" }
aptos-writeset-generator = { path = "../writeset-transaction-generator" }
cached-framework-packages = { path = "../framework/cached-packages" }
vm-genesis = { path = "../vm-genesis" }

## Other Aptos Dependencies
aptos-config = { path = "../../config" }
aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] }
aptos-keygen = { path = "../aptos-keygen" }
aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
aptos-types = { path = "../../types", features = ["fuzzing"] }
aptos-vm = { path = "../aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-writeset-generator = { path = "../writeset-transaction-generator" }
cached-framework-packages = { path = "../framework/cached-packages" }
move-deps = { path = "../move-deps", features = ["address32"] }
vm-genesis = { path = "../vm-genesis" }
21 changes: 8 additions & 13 deletions aptos-move/e2e-testsuite/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,19 @@ publish = false
[dependencies]
proptest = "1.0.0"

## Move dependencies
move-deps = { path = "../move-deps", features=["address32"] }

## Aptos-Move dependencies
aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] }
aptos-keygen = { path = "../aptos-keygen" }
aptos-logger = { path = "../../crates/aptos-logger" }
aptos-parallel-executor = { path = "../parallel-executor" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
aptos-types = { path = "../../types", features = ["fuzzing"] }
aptos-vm = { path = "../aptos-vm" }
aptos-writeset-generator = { path = "../writeset-transaction-generator"}
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-writeset-generator = { path = "../writeset-transaction-generator" }
cached-framework-packages = { path = "../framework/cached-packages" }
language-e2e-tests = { path = "../e2e-tests" }

## Other dependencies
aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] }
aptos-types = { path = "../../types", features = ["fuzzing"] }
aptos-transaction-builder = { path = "../../sdk/transaction-builder"}
aptos-logger = { path = "../../crates/aptos-logger" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
move-deps = { path = "../move-deps", features = ["address32"] }

[features]
default = ["aptos-transaction-builder/fuzzing"]
20 changes: 10 additions & 10 deletions aptos-move/framework/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ license = "Apache-2.0"
publish = false

[dependencies]
aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-types = { path = "../../types" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
transaction-builder-generator = { path = "../transaction-builder-generator" }
move-deps = { path = "../move-deps", features=["address32"] }

bcs = "0.1.3"
anyhow = "1.0.57"
bcs = "0.1.3"
clap = "3.1.8"
include_dir = "0.7.2"
log = "0.4.17"
once_cell = "1.10.0"
rayon = "1.5.2"
sha2 = "0.9.3"
once_cell = "1.10.0"
smallvec = "1.8.0"
structopt = "0.3.21"
include_dir = "0.7.2"
tempfile = "3.3.0"

aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-types = { path = "../../types" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
move-deps = { path = "../move-deps", features = ["address32"] }
transaction-builder-generator = { path = "../transaction-builder-generator" }

[dev-dependencies]
datatest-stable = "0.1.1"
dir-diff = "0.3.2"

aptos-vm = { path = "../../aptos-move/aptos-vm" }
move-deps = { path = "../move-deps", features=["table-extension"] }
move-deps = { path = "../move-deps", features = ["table-extension"] }

[features]
default = []
Expand Down
8 changes: 4 additions & 4 deletions aptos-move/framework/cached-packages/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ license = "Apache-2.0"
publish = false

[dependencies]
aptos-types = { path = "../../../types" }
aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" }
bcs = "0.1.3"
move-deps = { path = "../../move-deps", features=["address32"] }
include_dir = { version = "0.7.2", features = ["glob"] }
once_cell = "1.10.0"
proptest = { version = "1.0.0", optional = true }
proptest-derive = { version = "0.3.0", optional = true }

aptos-types = { path = "../../../types" }
aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" }
move-deps = { path = "../../move-deps", features = ["address32"] }

[build-dependencies]
move-deps = { path = "../../move-deps" }
framework = { path = ".." }
move-deps = { path = "../../move-deps" }

[features]
default = []
Expand Down
8 changes: 4 additions & 4 deletions aptos-move/genesis-viewer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ publish = false
edition = "2018"

[dependencies]
move-binary-format = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features = ["address32"] }
move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features = ["table-extension"] }
structopt = "0.3.21"

aptos-resource-viewer = { path = "../aptos-resource-viewer"}
aptos-resource-viewer = { path = "../aptos-resource-viewer" }
aptos-types = { path = "../../types" }
aptos-vm = { path = "../../aptos-move/aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
cached-framework-packages = { path = "../framework/cached-packages" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["address32"] }
move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["table-extension"] }
vm-genesis = { path = "../vm-genesis" }
2 changes: 1 addition & 1 deletion aptos-move/move-deps/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f2e758
move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
read-write-set = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3"}
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }

[features]
default = []
Expand Down
9 changes: 5 additions & 4 deletions aptos-move/move-examples/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ publish = false
edition = "2018"

[dependencies]
aptos-vm = { path = "../aptos-vm" }
aptos-types = {path = "../../types"}
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
clap = "3.1.8"
move-compiler = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-package = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-stdlib = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-unit-test = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["table-extension"] }
move-unit-test = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features = ["table-extension"] }

aptos-types = { path = "../../types" }
aptos-vm = { path = "../aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }

[dev-dependencies]
move-cli = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
Expand Down
9 changes: 4 additions & 5 deletions aptos-move/mvhashmap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ license = "Apache-2.0"
publish = false
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rayon = "1.5.2"
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
arc-swap = "1.5.0"
crossbeam = "0.8.1"
dashmap = "5.2.0"
arc-swap = "1.5.0"
rayon = "1.5.2"

aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }

[dev-dependencies]
proptest = "1.0.0"
Expand Down
Loading

0 comments on commit 5d91e05

Please sign in to comment.