Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions crates/wit-component/tests/merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ fn merging() -> Result<()> {
from.assert_valid();
into.assert_valid();

let from_clone = from.clone();
let into_clone = into.clone();

match into.merge(from) {
Ok(_) => {
assert!(
Expand All @@ -54,13 +51,6 @@ fn merging() -> Result<()> {
let output = printer.output.to_string();
assert_output(&expected, &output)?;
}

// Also assert merging in the reverse direction succeeds.
let mut reverse = from_clone;
reverse
.merge(into_clone)
.context("merge succeeded in one direction but failed in reverse")?;
reverse.assert_valid();
}
Err(e) => {
assert!(test_case.starts_with("bad-"), "failed to merge with {e:?}");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
failed to merge package `foo:foo` into existing copy: failed to merge interface `a`: expected type `a` to be present
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
failed to merge package `foo:foo` into existing copy: failed to merge interface `a`: expected function `a` to be present

This file was deleted.

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions crates/wit-component/tests/merge/commutative/from/a.wit

This file was deleted.

53 changes: 0 additions & 53 deletions crates/wit-component/tests/merge/commutative/into/a.wit

This file was deleted.

53 changes: 0 additions & 53 deletions crates/wit-component/tests/merge/commutative/merge/io.wit

This file was deleted.

10 changes: 0 additions & 10 deletions crates/wit-component/tests/merge/disjoint-funcs/merge/foo.wit

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions crates/wit-component/tests/merge/topo-sort-needed/README.md

This file was deleted.

19 changes: 0 additions & 19 deletions crates/wit-component/tests/merge/topo-sort-needed/from/a.wit

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions crates/wit-component/tests/merge/topo-sort-needed/merge/bar.wit

This file was deleted.

Loading
Loading