From 009ce61c2f2bb109b9ab3f8b8ff3881ea409fa38 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 26 Sep 2023 11:50:14 -0500 Subject: [PATCH] Fix merge conflict (#1217) More semicolons, restores green status to `main` --- .../tests/ui/parse-fail/duplicate-function-params.wit | 2 +- .../tests/ui/parse-fail/duplicate-function-params.wit.result | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit b/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit index e403758ccc..df303055ca 100644 --- a/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit +++ b/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit @@ -3,5 +3,5 @@ package foo:foo interface foo { - foo: func(foo: u32, foo: u64) + foo: func(foo: u32, foo: u64); } diff --git a/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit.result b/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit.result index 32c98b0843..8bfb8ad8ef 100644 --- a/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit.result +++ b/crates/wit-parser/tests/ui/parse-fail/duplicate-function-params.wit.result @@ -1,5 +1,5 @@ param `foo` is defined more than once --> tests/ui/parse-fail/duplicate-function-params.wit:6:23 | - 6 | foo: func(foo: u32, foo: u64) - | ^-- \ No newline at end of file + 6 | foo: func(foo: u32, foo: u64); + | ^--