Skip to content
Merged
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
82 changes: 50 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ version = "0.244.0"
# message to wasm-tools maintainers to discuss. In some cases it's possible to
# add version detection to build scripts but in other cases this may not be
# reasonable to expect.
rust-version = "1.81.0"
rust-version = "1.82.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for indexmap 2.13's replace_index 👍


[workspace.dependencies]
ahash = { version = "0.8.11", default-features = false }
Expand All @@ -118,9 +118,9 @@ comfy-table = { version = "7.1.3", default-features = false }
criterion = { version = "0.5.1", default-features = false }
env_logger = "0.11"
gimli = "0.31.1"
hashbrown = { version = "0.15.2", default-features = false, features = ['default-hasher'] }
hashbrown = { version = "0.16.1", default-features = false, features = ['default-hasher'] }
id-arena = { version = "2.3.0", default-features = false }
indexmap = { version = "2.7.0", default-features = false }
indexmap = { version = "2.13.0", default-features = false }
indoc = "2.0.5"
leb128fmt = { version = "0.1.0", default-features = false }
libfuzzer-sys = "0.4.0"
Expand Down
1 change: 1 addition & 0 deletions crates/wit-dylib/tests/roundtrip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ fn run_one(u: &mut Unstructured<'_>) -> Result<()> {
funcs
},
span: Default::default(),
clone_of: None,
});

// Generate two worlds in our custom package, one for the callee and one for
Expand Down
1 change: 1 addition & 0 deletions crates/wit-parser/src/ast/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ impl<'a> Resolver<'a> {
functions: IndexMap::default(),
package: None,
span,
clone_of: None,
})
}

Expand Down
2 changes: 2 additions & 0 deletions crates/wit-parser/src/decoding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ impl WitPackageDecoder<'_> {
package: None,
stability: Default::default(),
span: Default::default(),
clone_of: None,
})
});

Expand Down Expand Up @@ -968,6 +969,7 @@ impl WitPackageDecoder<'_> {
package: None,
stability: Default::default(),
span: Default::default(),
clone_of: None,
};

let owner = TypeOwner::Interface(self.resolve.interfaces.next_id());
Expand Down
12 changes: 12 additions & 0 deletions crates/wit-parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,18 @@ pub struct Interface {
/// Source span for this interface.
#[cfg_attr(feature = "serde", serde(skip))]
pub span: Span,

/// The interface that this one was cloned from, if any.
///
/// Applicable for [`Resolve::generate_nominal_type_ids`].
#[cfg_attr(
feature = "serde",
serde(
skip_serializing_if = "Option::is_none",
serialize_with = "serialize_optional_id",
)
)]
pub clone_of: Option<InterfaceId>,
}

impl Interface {
Expand Down
Loading