Skip to content

Commit a38a15d

Browse files
authored
Merge branch 'master' into jjcnn/unify_never
2 parents 6746694 + ac95d2d commit a38a15d

File tree

223 files changed

+8841
-2058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+8841
-2058
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,10 @@ jobs:
479479
run: cargo run --locked --release -p forc -- build --experimental error_type --release --locked --path ./test/src/sdk-harness
480480
- name: Cargo Test sway-lib-std - Experimental Feature 'error_type'
481481
run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
482+
- name: Build All Tests - Experimental Feature 'partial_eq'
483+
run: cargo run --locked --release -p forc -- build --experimental partial_eq --release --locked --path ./test/src/sdk-harness
484+
- name: Cargo Test sway-lib-std - Experimental Feature 'partial_eq'
485+
run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
482486

483487
forc-run-benchmarks:
484488
runs-on: buildjet-4vcpu-ubuntu-2204
@@ -547,18 +551,24 @@ jobs:
547551
run: forc build --experimental storage_domains --path sway-lib-core && forc test --experimental storage_domains --path sway-lib-core
548552
- name: Run Core Unit Tests - Experimental feature 'error_type'
549553
run: forc build --experimental error_type --path sway-lib-core && forc test --experimental error_type --path sway-lib-core
554+
- name: Run Core Unit Tests - Experimental feature 'partial_eq'
555+
run: forc build --experimental partial_eq --path sway-lib-core && forc test --experimental partial_eq --path sway-lib-core
550556
- name: Run Std Unit Tests
551557
run: forc build --path sway-lib-std && forc test --path sway-lib-std
552558
- name: Run Std Unit Tests - Experimental feature 'storage_domains'
553559
run: forc build --experimental storage_domains --path sway-lib-std && forc test --experimental storage_domains --path sway-lib-std
554560
- name: Run Std Unit Tests - Experimental feature 'error_type'
555561
run: forc build --experimental error_type --path sway-lib-std && forc test --experimental error_type --path sway-lib-std
562+
- name: Run Std Unit Tests - Experimental feature 'partial_eq'
563+
run: forc build --experimental partial_eq --path sway-lib-std && forc test --experimental partial_eq --path sway-lib-std
556564
- name: Run In Language Unit Tests
557565
run: forc build --path test/src/in_language_tests && forc test --path test/src/in_language_tests
558566
- name: Run In Language Unit Tests - Experimental feature 'storage_domains'
559567
run: forc build --experimental storage_domains --path test/src/in_language_tests && forc test --experimental storage_domains --path test/src/in_language_tests
560568
- name: Run In Language Unit Tests - Experimental feature 'error_type'
561569
run: forc build --experimental error_type --path test/src/in_language_tests && forc test --experimental error_type --path test/src/in_language_tests
570+
- name: Run In Language Unit Tests - Experimental feature 'partial_eq'
571+
run: forc build --experimental partial_eq --path test/src/in_language_tests && forc test --experimental partial_eq --path test/src/in_language_tests
562572

563573
forc-pkg-fuels-deps-check:
564574
runs-on: buildjet-4vcpu-ubuntu-2204

Cargo.lock

Lines changed: 127 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ members = [
1010
"forc-plugins/forc-fmt",
1111
"forc-plugins/forc-lsp",
1212
"forc-plugins/forc-migrate",
13+
"forc-plugins/forc-publish",
1314
"forc-plugins/forc-tx",
1415
"forc-test",
1516
"forc-tracing",
@@ -57,8 +58,9 @@ forc-debug = { path = "forc-plugins/forc-debug/", version = "0.66.7" }
5758
forc-doc = { path = "forc-plugins/forc-doc/", version = "0.66.7" }
5859
forc-fmt = { path = "forc-plugins/forc-fmt/", version = "0.66.7" }
5960
forc-lsp = { path = "forc-plugins/forc-lsp/", version = "0.66.7" }
60-
forc-tx = { path = "forc-plugins/forc-tx/", version = "0.66.7" }
6161
forc-migrate = { path = "forc-plugins/forc-migrate/", version = "0.66.7" }
62+
forc-publish = { path = "forc-plugins/forc-publish/", version = "0.66.7" }
63+
forc-tx = { path = "forc-plugins/forc-tx/", version = "0.66.7" }
6264

6365
sway-ast = { path = "sway-ast/", version = "0.66.7" }
6466
sway-core = { path = "sway-core/", version = "0.66.7" }
@@ -133,6 +135,7 @@ devault = "0.2"
133135
dialoguer = "0.11"
134136
dirs = "5.0"
135137
downcast-rs = "1.2"
138+
duplicate = "2.0"
136139
either = "1.9"
137140
ethabi = { package = "fuel-ethabi", version = "18.0" }
138141
etk-asm = { package = "fuel-etk-asm", version = "0.3.1-dev" }
@@ -230,6 +233,7 @@ unicode-bidi = "0.3"
230233
unicode-xid = "0.2"
231234
url = "2.2"
232235
urlencoding = "2.1"
236+
uuid = "1.13"
233237
vec1 = "1.8"
234238
vte = "0.13"
235239
walkdir = "2.3"

forc-plugins/forc-migrate/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ repository.workspace = true
1111
[dependencies]
1212
anyhow.workspace = true
1313
clap = { workspace = true, features = ["derive"] }
14+
duplicate.workspace = true
1415
forc-pkg.workspace = true
1516
forc-tracing.workspace = true
1617
forc-util.workspace = true

forc-plugins/forc-migrate/src/cli/commands/check.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ pub(crate) fn exec(command: Command) -> Result<()> {
4444
for migration_step in migration_steps.iter() {
4545
let migration_point_spans = match migration_step.kind {
4646
MigrationStepKind::Instruction(instruction) => instruction(&program_info)?,
47-
MigrationStepKind::CodeModification(modification, _) => {
47+
MigrationStepKind::CodeModification(modification, ..) => {
4848
modification(&mut program_info.as_mut(), DryRun::Yes)?
4949
}
50-
MigrationStepKind::Interaction(instruction, _, _) => instruction(&program_info)?,
50+
MigrationStepKind::Interaction(instruction, ..) => instruction(&program_info)?,
5151
};
5252

5353
check_result.push((feature, migration_step, migration_point_spans));

0 commit comments

Comments
 (0)