diff --git a/Cargo.lock b/Cargo.lock index 53ab1f8130e..773a3a1ae5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1108,7 +1108,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forc" -version = "0.16.1" +version = "0.16.2" dependencies = [ "annotate-snippets", "anyhow", @@ -1142,7 +1142,7 @@ dependencies = [ [[package]] name = "forc-explore" -version = "0.16.1" +version = "0.16.2" dependencies = [ "anyhow", "clap 3.2.5", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "forc-fmt" -version = "0.16.1" +version = "0.16.2" dependencies = [ "anyhow", "clap 3.2.5", @@ -1172,7 +1172,7 @@ dependencies = [ [[package]] name = "forc-fmt-v2" -version = "0.16.1" +version = "0.16.2" dependencies = [ "anyhow", "clap 3.2.5", @@ -1187,14 +1187,14 @@ dependencies = [ [[package]] name = "forc-gm" -version = "0.16.1" +version = "0.16.2" dependencies = [ "clap 3.2.5", ] [[package]] name = "forc-lsp" -version = "0.16.1" +version = "0.16.2" dependencies = [ "anyhow", "clap 3.2.5", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "forc-pkg" -version = "0.16.1" +version = "0.16.2" dependencies = [ "anyhow", "forc-util", @@ -1224,7 +1224,7 @@ dependencies = [ [[package]] name = "forc-util" -version = "0.16.1" +version = "0.16.2" dependencies = [ "annotate-snippets", "anyhow", @@ -3587,7 +3587,7 @@ dependencies = [ [[package]] name = "sway-core" -version = "0.16.1" +version = "0.16.2" dependencies = [ "clap 3.2.5", "derivative", @@ -3619,7 +3619,7 @@ dependencies = [ [[package]] name = "sway-fmt" -version = "0.16.1" +version = "0.16.2" dependencies = [ "ropey", "sway-core", @@ -3628,7 +3628,7 @@ dependencies = [ [[package]] name = "sway-fmt-v2" -version = "0.16.1" +version = "0.16.2" dependencies = [ "anyhow", "forc-util", @@ -3643,7 +3643,7 @@ dependencies = [ [[package]] name = "sway-ir" -version = "0.16.1" +version = "0.16.2" dependencies = [ "filecheck", "generational-arena", @@ -3654,7 +3654,7 @@ dependencies = [ [[package]] name = "sway-lsp" -version = "0.16.1" +version = "0.16.2" dependencies = [ "async-trait", "dashmap 5.3.4", @@ -3676,7 +3676,7 @@ dependencies = [ [[package]] name = "sway-parse" -version = "0.16.1" +version = "0.16.2" dependencies = [ "extension-trait", "num-bigint", @@ -3688,7 +3688,7 @@ dependencies = [ [[package]] name = "sway-types" -version = "0.16.1" +version = "0.16.2" dependencies = [ "fuel-asm", "fuel-crypto", @@ -3699,7 +3699,7 @@ dependencies = [ [[package]] name = "sway-utils" -version = "0.16.1" +version = "0.16.2" [[package]] name = "syn" diff --git a/forc-gm/Cargo.toml b/forc-gm/Cargo.toml index 6f6face4ff6..a715bb90274 100644 --- a/forc-gm/Cargo.toml +++ b/forc-gm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-gm" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" diff --git a/forc-pkg/Cargo.toml b/forc-pkg/Cargo.toml index 44d35dfb952..41d0e824f7c 100644 --- a/forc-pkg/Cargo.toml +++ b/forc-pkg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-pkg" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -10,15 +10,15 @@ description = "Building, locking, fetching and updating Sway projects as Forc pa [dependencies] anyhow = "1" -forc-util = { version = "0.16.1", path = "../forc-util" } +forc-util = { version = "0.16.2", path = "../forc-util" } fuels-types = "0.12" git2 = { version = "0.14", features = ["vendored-libgit2", "vendored-openssl"] } petgraph = { version = "0.6", features = ["serde-1"] } semver = { version = "1.0", features = ["serde"] } serde = { version = "1.0", features = ["derive"] } serde_ignored = "0.1" -sway-core = { version = "0.16.1", path = "../sway-core" } -sway-utils = { version = "0.16.1", path = "../sway-utils" } +sway-core = { version = "0.16.2", path = "../sway-core" } +sway-utils = { version = "0.16.2", path = "../sway-utils" } toml = "0.5" tracing = "0.1" url = { version = "2.2", features = ["serde"] } diff --git a/forc-plugins/forc-explore/Cargo.toml b/forc-plugins/forc-explore/Cargo.toml index 8fe0e61ec8c..4850c2dc859 100644 --- a/forc-plugins/forc-explore/Cargo.toml +++ b/forc-plugins/forc-explore/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-explore" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -11,7 +11,7 @@ description = "A `forc` plugin for running the fuel block explorer." [dependencies] anyhow = "1" clap = { version = "3", features = ["derive"] } -forc-util = { version = "0.16.1", path = "../../forc-util" } +forc-util = { version = "0.16.2", path = "../../forc-util" } reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] } serde = { version = "1.0", features = ["derive"] } tar = "0.4" diff --git a/forc-plugins/forc-fmt-v2/Cargo.toml b/forc-plugins/forc-fmt-v2/Cargo.toml index d6f23c178d4..3408d63f24e 100644 --- a/forc-plugins/forc-fmt-v2/Cargo.toml +++ b/forc-plugins/forc-fmt-v2/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-fmt-v2" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -12,10 +12,10 @@ description = "A `forc` plugin for running the Sway code formatter." [dependencies] anyhow = "1" clap = { version = "3", features = ["derive"] } -forc-util = { version = "0.16.1", path = "../../forc-util" } +forc-util = { version = "0.16.2", path = "../../forc-util" } prettydiff = "0.5" -sway-core = { version = "0.16.1", path = "../../sway-core" } -sway-fmt-v2 = { version = "0.16.1", path = "../../sway-fmt-v2" } -sway-utils = { version = "0.16.1", path = "../../sway-utils" } +sway-core = { version = "0.16.2", path = "../../sway-core" } +sway-fmt-v2 = { version = "0.16.2", path = "../../sway-fmt-v2" } +sway-utils = { version = "0.16.2", path = "../../sway-utils" } taplo = "0.7" tracing = "0.1" diff --git a/forc-plugins/forc-fmt/Cargo.toml b/forc-plugins/forc-fmt/Cargo.toml index 06188bcf4b3..00dabc3b507 100644 --- a/forc-plugins/forc-fmt/Cargo.toml +++ b/forc-plugins/forc-fmt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-fmt" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -11,10 +11,10 @@ description = "A `forc` plugin for running the Sway code formatter." [dependencies] anyhow = "1" clap = { version = "3", features = ["derive"] } -forc-util = { version = "0.16.1", path = "../../forc-util" } +forc-util = { version = "0.16.2", path = "../../forc-util" } prettydiff = "0.5" -sway-core = { version = "0.16.1", path = "../../sway-core" } -sway-fmt = { version = "0.16.1", path = "../../sway-fmt" } -sway-utils = { version = "0.16.1", path = "../../sway-utils" } +sway-core = { version = "0.16.2", path = "../../sway-core" } +sway-fmt = { version = "0.16.2", path = "../../sway-fmt" } +sway-utils = { version = "0.16.2", path = "../../sway-utils" } taplo = "0.7" tracing = "0.1" diff --git a/forc-plugins/forc-lsp/Cargo.toml b/forc-plugins/forc-lsp/Cargo.toml index 64c47901d19..5c1614ba4c5 100644 --- a/forc-plugins/forc-lsp/Cargo.toml +++ b/forc-plugins/forc-lsp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-lsp" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -11,5 +11,5 @@ description = "A simple `forc` plugin for starting the sway language server." [dependencies] anyhow = "1" clap = { version = "3", features = ["derive"] } -sway-lsp = { version = "0.16.1", path = "../../sway-lsp" } +sway-lsp = { version = "0.16.2", path = "../../sway-lsp" } tokio = { version = "1.8" } diff --git a/forc-util/Cargo.toml b/forc-util/Cargo.toml index b71660fb188..731ed398ef6 100644 --- a/forc-util/Cargo.toml +++ b/forc-util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc-util" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -12,9 +12,9 @@ description = "Utility items shared between forc crates." annotate-snippets = { version = "0.9", features = ["color"] } anyhow = "1" dirs = "3.0.2" -sway-core = { version = "0.16.1", path = "../sway-core" } -sway-types = { version = "0.16.1", path = "../sway-types" } -sway-utils = { version = "0.16.1", path = "../sway-utils" } +sway-core = { version = "0.16.2", path = "../sway-core" } +sway-types = { version = "0.16.2", path = "../sway-types" } +sway-utils = { version = "0.16.2", path = "../sway-utils" } termcolor = "1.1" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] } diff --git a/forc/Cargo.toml b/forc/Cargo.toml index 435a4919f78..6cfd4cff450 100644 --- a/forc/Cargo.toml +++ b/forc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forc" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -21,8 +21,8 @@ annotate-snippets = { version = "0.9", features = ["color"] } anyhow = "1.0.41" clap = { version = "3.1", features = ["cargo", "derive", "env"] } clap_complete = "3.1" -forc-pkg = { version = "0.16.1", path = "../forc-pkg" } -forc-util = { version = "0.16.1", path = "../forc-util" } +forc-pkg = { version = "0.16.2", path = "../forc-pkg" } +forc-util = { version = "0.16.2", path = "../forc-util" } fs_extra = "1.2" fuel-asm = "0.5" fuel-crypto = "0.5" @@ -33,9 +33,9 @@ futures = "0.3" hex = "0.4.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.73" -sway-core = { version = "0.16.1", path = "../sway-core" } -sway-types = { version = "0.16.1", path = "../sway-types" } -sway-utils = { version = "0.16.1", path = "../sway-utils" } +sway-core = { version = "0.16.2", path = "../sway-core" } +sway-types = { version = "0.16.2", path = "../sway-types" } +sway-utils = { version = "0.16.2", path = "../sway-utils" } term-table = "1.3" tokio = { version = "1.8.0", features = ["macros", "rt-multi-thread", "process"] } toml = "0.5" diff --git a/sway-core/Cargo.toml b/sway-core/Cargo.toml index 12c4a0eedd3..62372205260 100644 --- a/sway-core/Cargo.toml +++ b/sway-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-core" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -28,10 +28,10 @@ regex = "1" serde = { version = "1.0", features = ["derive"] } sha2 = "0.9" smallvec = "1.7" -sway-ir = { version = "0.16.1", path = "../sway-ir" } -sway-parse = { version = "0.16.1", path = "../sway-parse" } -sway-types = { version = "0.16.1", path = "../sway-types" } -sway-utils = { version = "0.16.1", path = "../sway-utils" } +sway-ir = { version = "0.16.2", path = "../sway-ir" } +sway-parse = { version = "0.16.2", path = "../sway-parse" } +sway-types = { version = "0.16.2", path = "../sway-types" } +sway-utils = { version = "0.16.2", path = "../sway-utils" } thiserror = "1.0" tracing = "0.1" uint = "0.9" diff --git a/sway-fmt-v2/Cargo.toml b/sway-fmt-v2/Cargo.toml index eb8accb7da7..7c82823560a 100644 --- a/sway-fmt-v2/Cargo.toml +++ b/sway-fmt-v2/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-fmt-v2" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -11,11 +11,11 @@ description = "Sway sway-fmt-v2." [dependencies] anyhow = "1" -forc-util = { version = "0.16.1", path = "../forc-util" } +forc-util = { version = "0.16.2", path = "../forc-util" } serde = { version = "1.0", features = ["derive"] } serde_ignored = "0.1" -sway-core = { version = "0.16.1", path = "../sway-core" } -sway-parse = { version = "0.16.1", path = "../sway-parse" } -sway-types = { version = "0.16.1", path = "../sway-types" } +sway-core = { version = "0.16.2", path = "../sway-core" } +sway-parse = { version = "0.16.2", path = "../sway-parse" } +sway-types = { version = "0.16.2", path = "../sway-types" } thiserror = "1.0.30" toml = "0.5" diff --git a/sway-fmt/Cargo.toml b/sway-fmt/Cargo.toml index 72f4967f3c9..c7016da9e7a 100644 --- a/sway-fmt/Cargo.toml +++ b/sway-fmt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-fmt" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -10,6 +10,6 @@ description = "Sway sway-fmt." [dependencies] ropey = "1.2" -sway-core = { version = "0.16.1", path = "../sway-core" } -sway-types = { version = "0.16.1", path = "../sway-types" } +sway-core = { version = "0.16.2", path = "../sway-core" } +sway-types = { version = "0.16.2", path = "../sway-types" } diff --git a/sway-ir/Cargo.toml b/sway-ir/Cargo.toml index 43759b163c5..2af5a31b5a9 100644 --- a/sway-ir/Cargo.toml +++ b/sway-ir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-ir" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -12,5 +12,5 @@ description = "Sway intermediate representation." filecheck = "0.5" generational-arena = "0.2" peg = "0.7" -sway-types = { version = "0.16.1", path = "../sway-types" } +sway-types = { version = "0.16.2", path = "../sway-types" } tracing = "0.1" diff --git a/sway-lsp/Cargo.toml b/sway-lsp/Cargo.toml index 24d880c2266..fd4ae6cd023 100644 --- a/sway-lsp/Cargo.toml +++ b/sway-lsp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-lsp" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -10,15 +10,15 @@ description = "LSP server for Sway." [dependencies] dashmap = "5.3.4" -forc = { version = "0.16.1", path = "../forc" } -forc-pkg = { version = "0.16.1", path = "../forc-pkg" } -forc-util = { version = "0.16.1", path = "../forc-util" } +forc = { version = "0.16.2", path = "../forc" } +forc-pkg = { version = "0.16.2", path = "../forc-pkg" } +forc-util = { version = "0.16.2", path = "../forc-util" } ropey = "1.2" serde_json = "1.0.60" -sway-core = { version = "0.16.1", path = "../sway-core" } -sway-fmt = { version = "0.16.1", path = "../sway-fmt" } -sway-types = { version = "0.16.1", path = "../sway-types" } -sway-utils = { version = "0.16.1", path = "../sway-utils" } +sway-core = { version = "0.16.2", path = "../sway-core" } +sway-fmt = { version = "0.16.2", path = "../sway-fmt" } +sway-types = { version = "0.16.2", path = "../sway-types" } +sway-utils = { version = "0.16.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" tracing = "0.1" diff --git a/sway-parse/Cargo.toml b/sway-parse/Cargo.toml index 0c867c4489a..7cd60371486 100644 --- a/sway-parse/Cargo.toml +++ b/sway-parse/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-parse" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" @@ -12,7 +12,7 @@ description = "Sway's parser" extension-trait = "1.0.1" num-bigint = "0.4.3" num-traits = "0.2.14" -sway-types = { version = "0.16.1", path = "../sway-types" } +sway-types = { version = "0.16.2", path = "../sway-types" } thiserror = "1.0" unicode-xid = "0.2.2" diff --git a/sway-types/Cargo.toml b/sway-types/Cargo.toml index 7ad4ed637da..326b254d5a7 100644 --- a/sway-types/Cargo.toml +++ b/sway-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-types" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" diff --git a/sway-utils/Cargo.toml b/sway-utils/Cargo.toml index 7db1685c9db..9571d9e5a07 100644 --- a/sway-utils/Cargo.toml +++ b/sway-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sway-utils" -version = "0.16.1" +version = "0.16.2" authors = ["Fuel Labs "] edition = "2021" homepage = "https://fuel.network/" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.lock index 6e84b4ba004..d48c6d9bafc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.lock @@ -1,14 +1,9 @@ [[package]] name = 'core' -source = 'path+from-root-A102296F39438745' +source = 'path+from-root-E1D1F5F82094B853' dependencies = [] [[package]] name = 'match_expressions_rest' source = 'root' -dependencies = ['std'] - -[[package]] -name = 'std' -source = 'git+https://github.com/fuellabs/sway?tag=v0.16.1#dcf22453aeb054335d96ef810da9d4f756d869b7' dependencies = ['core'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.toml index 1e1e81306ea..6bd4932e6dc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/Forc.toml @@ -1,6 +1,8 @@ [project] authors = ["Fuel Labs "] +entry = "main.sw" license = "Apache-2.0" name = "match_expressions_rest" -entry = "main.sw" -implicit-std = true + +[dependencies] +core = { path = "../../../../../../../sway-lib-core" }