diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ea681b80e4..efa014baf71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,6 +111,22 @@ jobs: command: clippy args: --all-features --all-targets -- -D warnings + cargo-toml-fmt-check: + needs: cancel-previous-runs + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Install Cargo.toml linter + uses: baptiste0928/cargo-install@v1 + with: + crate: cargo-toml-lint + version: "0.1" + - name: Run Cargo.toml linter + run: git ls-files | grep Cargo.toml$ | xargs --verbose -n 1 cargo-toml-lint + cargo-fmt-check: needs: cancel-previous-runs runs-on: ubuntu-latest diff --git a/forc/Cargo.toml b/forc/Cargo.toml index bbef1a78582..60161e4285f 100644 --- a/forc/Cargo.toml +++ b/forc/Cargo.toml @@ -28,8 +28,8 @@ serde_json = "1.0.73" sway-core = { version = "0.9.2", path = "../sway-core" } sway-fmt = { version = "0.9.2", path = "../sway-fmt" } sway-lsp = { version = "0.9.2", path = "../sway-lsp" } -sway-utils = { version = "0.9.2", path = "../sway-utils" } sway-types = { version = "0.9.2", path = "../sway-types" } +sway-utils = { version = "0.9.2", path = "../sway-utils" } taplo = "0.7" tar = "0.4.35" term-table = "1.3" diff --git a/sway-core/Cargo.toml b/sway-core/Cargo.toml index c69d971b66a..e810d3d29d4 100644 --- a/sway-core/Cargo.toml +++ b/sway-core/Cargo.toml @@ -19,6 +19,7 @@ either = "1.6" fuel-asm = "0.3" fuel-crypto = "0.4" fuel-vm = "0.6" +generational-arena = "0.2" hex = { version = "0.4", optional = true } itertools = "0.10" lazy_static = "1.4" @@ -34,7 +35,6 @@ smallvec = "1.7" sway-ir = { version = "0.9.2", path = "../sway-ir" } sway-types = { version = "0.9.2", path = "../sway-types" } sway-utils = { version = "0.9.2", path = "../sway-utils" } -generational-arena = "0.2" thiserror = "1.0" [[bin]] diff --git a/sway-lib-std/tests/Cargo.toml b/sway-lib-std/tests/Cargo.toml index 806d5b5a863..1eed492b488 100644 --- a/sway-lib-std/tests/Cargo.toml +++ b/sway-lib-std/tests/Cargo.toml @@ -12,9 +12,9 @@ fuel-tx = "0.7" fuel-types = "0.3" fuel-vm = "0.6" fuels-abigen-macro = "0.8" -fuels-signers = { version = "0.8", features=["test-helpers"] } fuels-contract = "0.8" fuels-core = "0.8" +fuels-signers = { version = "0.8", features=["test-helpers"] } rand = "0.8" tokio = { version = "1.12", features = ["rt", "macros"] } diff --git a/sway-lsp/Cargo.toml b/sway-lsp/Cargo.toml index 31014bafc3a..67fb470ba58 100644 --- a/sway-lsp/Cargo.toml +++ b/sway-lsp/Cargo.toml @@ -11,7 +11,6 @@ description = "LSP server for Sway." [dependencies] dashmap = "4.0.2" forc-util = { version = "0.9.2", path = "../forc-util" } -tower-lsp = "0.16.0" ropey = "1.2" serde_json = "1.0.60" sway-core = { version = "0.9.2", path = "../sway-core" } @@ -19,6 +18,7 @@ sway-fmt = { version = "0.9.2", path = "../sway-fmt" } sway-types = { version = "0.9.2", path = "../sway-types" } sway-utils = { version = "0.9.2", path = "../sway-utils" } tokio = { version = "1.3", features = ["io-std", "io-util", "macros", "net", "rt-multi-thread", "sync", "time"] } +tower-lsp = "0.16.0" [dev-dependencies] async-trait = "0.1" diff --git a/test/Cargo.toml b/test/Cargo.toml index ead1212f9b4..2ce170eb8e5 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -13,5 +13,5 @@ fuel-tx = "0.7" fuel-vm = { version = "0.6", features = ["random"] } rand = "0.8" regex = "1" -tokio = "1.12" serde_json = "1.0.73" +tokio = "1.12"