From 5d98d8cfb92fce700803f945413d3b0ec1721be3 Mon Sep 17 00:00:00 2001 From: Daniel Macovei Date: Thu, 11 Jul 2024 11:50:03 -0500 Subject: [PATCH] remove package kind --- crates/wit-component/src/encoding/wit/v2.rs | 2 +- crates/wit-component/src/metadata.rs | 3 +- crates/wit-parser/src/ast.rs | 7 +--- crates/wit-parser/src/ast/resolve.rs | 39 +++++++------------ crates/wit-parser/src/decoding.rs | 12 ------ crates/wit-parser/src/lib.rs | 5 +-- crates/wit-parser/src/resolve.rs | 11 ------ crates/wit-parser/tests/ui/comments.wit.json | 1 - .../tests/ui/complex-include.wit.json | 3 -- .../tests/ui/cross-package-resource.wit.json | 2 - crates/wit-parser/tests/ui/diamond1.wit.json | 3 -- .../tests/ui/disambiguate-diamond.wit.json | 1 - crates/wit-parser/tests/ui/empty.wit.json | 1 - .../tests/ui/feature-gates.wit.json | 1 - .../tests/ui/foreign-deps-union.wit.json | 7 ---- .../wit-parser/tests/ui/foreign-deps.wit.json | 7 ---- crates/wit-parser/tests/ui/functions.wit.json | 1 - .../tests/ui/ignore-files-deps.wit.json | 2 - .../tests/ui/import-export-overlap1.wit.json | 1 - .../tests/ui/import-export-overlap2.wit.json | 1 - .../wit-parser/tests/ui/include-reps.wit.json | 1 - .../tests/ui/kebab-name-include-with.wit.json | 1 - .../tests/ui/kinds-of-deps.wit.json | 5 --- .../wit-parser/tests/ui/many-names.wit.json | 1 - .../ui/multi-file-multi-package.wit.json | 4 -- .../wit-parser/tests/ui/multi-file.wit.json | 1 - .../ui/multi-package-shared-deps.wit.json | 4 -- .../ui/multi-package-transitive-deps.wit.json | 4 -- .../ui/name-both-resource-and-type.wit.json | 2 - .../tests/ui/package-syntax1.wit.json | 1 - .../tests/ui/package-syntax3.wit.json | 1 - .../tests/ui/package-syntax4.wit.json | 1 - ...ges-explicit-colliding-decl-names.wit.json | 2 - ...ages-explicit-internal-references.wit.json | 2 - .../ui/packages-explicit-with-semver.wit.json | 2 - .../ui/packages-multiple-explicit.wit.json | 2 - .../ui/packages-single-explicit.wit.json | 1 - crates/wit-parser/tests/ui/random.wit.json | 1 - .../tests/ui/resources-empty.wit.json | 1 - .../resources-multiple-returns-own.wit.json | 1 - .../tests/ui/resources-multiple.wit.json | 1 - .../tests/ui/resources-return-own.wit.json | 1 - crates/wit-parser/tests/ui/resources.wit.json | 1 - .../wit-parser/tests/ui/resources1.wit.json | 1 - .../tests/ui/same-name-import-export.wit.json | 1 - .../wit-parser/tests/ui/shared-types.wit.json | 1 - .../tests/ui/simple-wasm-text.wit.json | 1 - .../tests/ui/since-and-unstable.wit.json | 1 - .../tests/ui/stress-export-elaborate.wit.json | 1 - .../tests/ui/type-then-eof.wit.json | 1 - crates/wit-parser/tests/ui/types.wit.json | 1 - .../wit-parser/tests/ui/union-fuzz-1.wit.json | 1 - .../wit-parser/tests/ui/union-fuzz-2.wit.json | 1 - crates/wit-parser/tests/ui/use-chain.wit.json | 1 - crates/wit-parser/tests/ui/use.wit.json | 1 - crates/wit-parser/tests/ui/versions.wit.json | 3 -- crates/wit-parser/tests/ui/wasi.wit.json | 1 - .../tests/ui/world-diamond.wit.json | 1 - .../tests/ui/world-iface-no-collide.wit.json | 1 - .../tests/ui/world-implicit-import1.wit.json | 1 - .../tests/ui/world-implicit-import2.wit.json | 1 - .../tests/ui/world-implicit-import3.wit.json | 1 - .../tests/ui/world-same-fields4.wit.json | 1 - .../tests/ui/world-top-level-funcs.wit.json | 1 - .../ui/world-top-level-resources.wit.json | 1 - .../tests/ui/worlds-union-dedup.wit.json | 1 - .../tests/ui/worlds-with-types.wit.json | 1 - 67 files changed, 19 insertions(+), 158 deletions(-) diff --git a/crates/wit-component/src/encoding/wit/v2.rs b/crates/wit-component/src/encoding/wit/v2.rs index a9fb022dce..7476dfd094 100644 --- a/crates/wit-component/src/encoding/wit/v2.rs +++ b/crates/wit-component/src/encoding/wit/v2.rs @@ -54,7 +54,7 @@ impl Encoder<'_> { let mut names = NameMap::new(); for pkg in self.packages { let package = &self.resolve.packages[*pkg]; - if let PackageKind::Explicit = package.kind { + if self.packages.len() > 1 { let mut sub_encoder = Encoder { component: ComponentBuilder::default(), resolve: self.resolve, diff --git a/crates/wit-component/src/metadata.rs b/crates/wit-component/src/metadata.rs index 61cc78fa36..f3e43614a7 100644 --- a/crates/wit-component/src/metadata.rs +++ b/crates/wit-component/src/metadata.rs @@ -51,7 +51,7 @@ use wasm_encoder::{ }; use wasm_metadata::Producers; use wasmparser::{BinaryReader, Encoding, Parser, Payload, WasmFeatures}; -use wit_parser::{Package, PackageKind, PackageName, Resolve, World, WorldId, WorldItem}; +use wit_parser::{Package, PackageName, Resolve, World, WorldId, WorldItem}; const CURRENT_VERSION: u8 = 0x04; const CUSTOM_SECTION_NAME: &str = "wit-component-encoding"; @@ -80,7 +80,6 @@ impl Default for Bindgen { name: "root".to_string(), version: None, }, - kind: PackageKind::Implicit, docs: Default::default(), interfaces: Default::default(), worlds: Default::default(), diff --git a/crates/wit-parser/src/ast.rs b/crates/wit-parser/src/ast.rs index d9dfbdbb18..d65d5fed4f 100644 --- a/crates/wit-parser/src/ast.rs +++ b/crates/wit-parser/src/ast.rs @@ -1592,11 +1592,6 @@ enum ResolverKind<'a> { PartialImplicit(Resolver<'a>), } -pub(crate) enum ResolverKindTag { - Explicit, - Implicit, -} - fn parse_package( unparsed_pkgs: Vec, src: &Source, @@ -1729,7 +1724,7 @@ impl SourceMap { match resolver_kind { ResolverKind::Unknown => bail!("No WIT packages found in the supplied source"), ResolverKind::Explicit(pkgs) => Ok(pkgs), - ResolverKind::PartialImplicit(mut resolver) => match resolver.resolve(ResolverKindTag::Implicit)? { + ResolverKind::PartialImplicit(mut resolver) => match resolver.resolve()? { Some(pkg) => Ok(vec![pkg]), None => bail!("No WIT packages found in the supplied source"), }, diff --git a/crates/wit-parser/src/ast/resolve.rs b/crates/wit-parser/src/ast/resolve.rs index 6fc6dc9e63..0d3465a602 100644 --- a/crates/wit-parser/src/ast/resolve.rs +++ b/crates/wit-parser/src/ast/resolve.rs @@ -1,4 +1,4 @@ -use super::{ParamList, ResolverKindTag, ResultList, WorldOrInterface}; +use super::{ParamList, ResultList, WorldOrInterface}; use crate::ast::toposort::toposort; use crate::*; use anyhow::bail; @@ -14,7 +14,7 @@ pub struct Resolver<'a> { package_docs: Docs, /// All non-`package` WIT decls are going to be resolved together. - decl_lists: Vec<(PackageKind, ast::DeclList<'a>)>, + decl_lists: Vec>, // Arenas that get plumbed to the final `UnresolvedPackage` types: Arena, @@ -140,12 +140,11 @@ impl<'a> Resolver<'a> { self.package_docs = docs; } } - self.decl_lists - .push((PackageKind::Implicit, partial.decl_list)); + self.decl_lists.push(partial.decl_list); Ok(()) } - pub(crate) fn resolve(&mut self, kind: ResolverKindTag) -> Result> { + pub(crate) fn resolve(&mut self) -> Result> { // At least one of the WIT files must have a `package` annotation. let name = match &self.package_name { Some(name) => name.clone(), @@ -172,7 +171,7 @@ impl<'a> Resolver<'a> { let mut iface_id_to_ast = IndexMap::new(); let mut world_id_to_ast = IndexMap::new(); for (i, decl_list) in decl_lists.iter().enumerate() { - for item in decl_list.1.items.iter() { + for item in decl_list.items.iter() { match item { ast::AstItem::Interface(iface) => { let id = match self.ast_items[i][iface.name.name] { @@ -207,10 +206,6 @@ impl<'a> Resolver<'a> { Ok(Some(UnresolvedPackage { name, - kind: match kind { - ResolverKindTag::Explicit => PackageKind::Explicit, - ResolverKindTag::Implicit => PackageKind::Implicit, - }, docs: mem::take(&mut self.package_docs), worlds: mem::take(&mut self.worlds), types: mem::take(&mut self.types), @@ -242,21 +237,20 @@ impl<'a> Resolver<'a> { ) -> Result> { self.package_name = Some(package.package_id.package_name()); self.docs(&package.package_id.docs); - self.decl_lists = vec![(PackageKind::Explicit, package.decl_list)]; - self.resolve(ResolverKindTag::Explicit) + self.decl_lists = vec![package.decl_list]; + self.resolve() } /// Registers all foreign dependencies made within the ASTs provided. /// /// This will populate the `self.foreign_{deps,interfaces,worlds}` maps with all /// `UsePath::Package` entries. - fn populate_foreign_deps(&mut self, decl_lists: &[(PackageKind, ast::DeclList<'a>)]) { + fn populate_foreign_deps(&mut self, decl_lists: &[ast::DeclList<'a>]) { let mut foreign_deps = mem::take(&mut self.foreign_deps); let mut foreign_interfaces = mem::take(&mut self.foreign_interfaces); let mut foreign_worlds = mem::take(&mut self.foreign_worlds); for decl_list in decl_lists { decl_list - .1 .for_each_path(|_, path, _names, world_or_iface| { let (id, name) = match path { ast::UsePath::Package { id, name } => (id, name), @@ -344,7 +338,7 @@ impl<'a> Resolver<'a> { /// generated for resolving use-paths later on. fn populate_ast_items( &mut self, - decl_lists: &[(PackageKind, ast::DeclList<'a>)], + decl_lists: &[ast::DeclList<'a>], ) -> Result<(Vec, Vec)> { let mut package_items = IndexMap::new(); @@ -355,7 +349,7 @@ impl<'a> Resolver<'a> { let mut order = IndexMap::new(); for decl_list in decl_lists { let mut decl_list_ns = IndexMap::new(); - for item in decl_list.1.items.iter() { + for item in decl_list.items.iter() { match item { ast::AstItem::Interface(i) => { if package_items.insert(i.name.name, i.name.span).is_some() { @@ -407,7 +401,7 @@ impl<'a> Resolver<'a> { // package or foreign items. Foreign deps are ignored for // topological ordering. let mut decl_list_ns = IndexMap::new(); - for item in decl_list.1.items.iter() { + for item in decl_list.items.iter() { let (name, src) = match item { ast::AstItem::Use(u) => { let name = u.as_.as_ref().unwrap_or(u.item.name()); @@ -430,7 +424,7 @@ impl<'a> Resolver<'a> { // With this file's namespace information look at all `use` paths // and record dependencies between interfaces. - decl_list.1.for_each_path(|iface, path, _names, _| { + decl_list.for_each_path(|iface, path, _names, _| { // If this import isn't contained within an interface then it's // in a world and it doesn't need to participate in our // topo-sort. @@ -496,7 +490,7 @@ impl<'a> Resolver<'a> { } for decl_list in decl_lists { let mut items = IndexMap::new(); - for item in decl_list.1.items.iter() { + for item in decl_list.items.iter() { let (name, ast_item) = match item { ast::AstItem::Use(u) => { if !u.attributes.is_empty() { @@ -554,13 +548,10 @@ impl<'a> Resolver<'a> { /// This is done after all interfaces are generated so `self.resolve_path` /// can be used to determine if what's being imported from is a foreign /// interface or not. - fn populate_foreign_types( - &mut self, - decl_lists: &[(PackageKind, ast::DeclList<'a>)], - ) -> Result<()> { + fn populate_foreign_types(&mut self, decl_lists: &[ast::DeclList<'a>]) -> Result<()> { for (i, decl_list) in decl_lists.iter().enumerate() { self.cur_ast_index = i; - decl_list.1.for_each_path(|_, path, names, _| { + decl_list.for_each_path(|_, path, names, _| { let names = match names { Some(names) => names, None => return Ok(()), diff --git a/crates/wit-parser/src/decoding.rs b/crates/wit-parser/src/decoding.rs index d2840918fa..51385b27d0 100644 --- a/crates/wit-parser/src/decoding.rs +++ b/crates/wit-parser/src/decoding.rs @@ -1,4 +1,3 @@ -use crate::resolve::PackageKind; use crate::*; use anyhow::{anyhow, bail}; use indexmap::IndexSet; @@ -413,7 +412,6 @@ impl ComponentInfo { let mut resolve = if let Some(name) = pkg_name { let pkg = Package { name, - kind: PackageKind::Implicit, docs: Docs::default(), interfaces: fields.interfaces.clone(), worlds: fields.worlds.clone(), @@ -484,7 +482,6 @@ impl ComponentInfo { pkg_names.push(name.clone()); let pkg = Package { name: name.clone(), - kind: PackageKind::Implicit, docs: Docs::default(), interfaces: fields.interfaces.clone(), worlds: fields.worlds.clone(), @@ -495,7 +492,6 @@ impl ComponentInfo { } else { let pkg = Package { name: name.clone(), - kind: PackageKind::Implicit, docs: Docs::default(), interfaces: fields.interfaces.clone(), worlds: fields.worlds.clone(), @@ -508,7 +504,6 @@ impl ComponentInfo { let pkg = if let Some(name) = pkg_name { Package { name: name.clone(), - kind: PackageKind::Implicit, docs: Docs::default(), interfaces: fields.interfaces.clone(), worlds: fields.worlds.clone(), @@ -516,7 +511,6 @@ impl ComponentInfo { } else { Package { name: explicit.name.as_ref().unwrap().clone(), - kind: PackageKind::Implicit, docs: Docs::default(), interfaces: fields.interfaces.clone(), worlds: fields.worlds.clone(), @@ -582,7 +576,6 @@ impl ComponentInfo { version: None, name: "component".to_string(), }, - kind: PackageKind::Implicit, docs: Default::default(), worlds: [(world_name.to_string(), world)].into_iter().collect(), interfaces: Default::default(), @@ -747,7 +740,6 @@ pub fn decode_world(wasm: &[u8]) -> Result<(Resolve, WorldId)> { let name = decoder.decode_world(name, &types[ty], &mut fields)?; let (resolve, pkg) = decoder.finish(Package { name, - kind: PackageKind::Implicit, interfaces: fields.interfaces.clone(), worlds: fields.worlds.clone(), docs: Default::default(), @@ -822,7 +814,6 @@ impl WitPackageDecoder<'_> { } _ => bail!("package name is not a valid id: {name}"), }, - kind: PackageKind::Implicit, docs: Default::default(), interfaces: Default::default(), worlds: Default::default(), @@ -1151,7 +1142,6 @@ impl WitPackageDecoder<'_> { .entry(package_name.to_string()) .or_insert_with(|| Package { name: package_name.clone(), - kind: PackageKind::Implicit, docs: Default::default(), interfaces: Default::default(), worlds: Default::default(), @@ -1738,7 +1728,6 @@ impl WitPackageDecoder<'_> { fn insert_package(&mut self, package: Package) -> PackageId { let Package { name, - kind, interfaces, worlds, docs, @@ -1757,7 +1746,6 @@ impl WitPackageDecoder<'_> { .unwrap_or_else(|| { let id = self.resolve.packages.alloc(Package { name: name.clone(), - kind: kind.clone(), interfaces: Default::default(), worlds: Default::default(), docs, diff --git a/crates/wit-parser/src/lib.rs b/crates/wit-parser/src/lib.rs index 9cf496e907..2ab630cc69 100644 --- a/crates/wit-parser/src/lib.rs +++ b/crates/wit-parser/src/lib.rs @@ -21,7 +21,7 @@ pub use ast::{parse_use_path, ParsedUsePath}; mod sizealign; pub use sizealign::*; mod resolve; -pub use resolve::{Package, PackageId, PackageKind, Remap, Resolve}; +pub use resolve::{Package, PackageId, Remap, Resolve}; mod live; pub use live::LiveTypes; @@ -72,9 +72,6 @@ pub struct UnresolvedPackage { /// The namespace, name, and version information for this package. pub name: PackageName, - /// Kind - pub kind: PackageKind, - /// All worlds from all documents within this package. /// /// Each world lists the document that it is from. diff --git a/crates/wit-parser/src/resolve.rs b/crates/wit-parser/src/resolve.rs index d7ef0f4956..a789c09d29 100644 --- a/crates/wit-parser/src/resolve.rs +++ b/crates/wit-parser/src/resolve.rs @@ -80,13 +80,6 @@ pub struct Resolve { pub all_features: bool, } -#[derive(PartialEq, Clone, Debug)] -#[cfg_attr(feature = "serde", derive(Serialize))] -pub enum PackageKind { - Explicit, - Implicit, -} - /// A WIT package within a `Resolve`. /// /// A package is a collection of interfaces and worlds. Packages additionally @@ -98,9 +91,6 @@ pub struct Package { /// A unique name corresponding to this package. pub name: PackageName, - /// Kind - pub kind: PackageKind, - /// Documentation associated with this package. #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Docs::is_empty"))] pub docs: Docs, @@ -1398,7 +1388,6 @@ impl Remap { let pkgid = resolve.packages.alloc(Package { name: unresolved.name.clone(), - kind: unresolved.kind.clone(), docs: unresolved.docs.clone(), interfaces: Default::default(), worlds: Default::default(), diff --git a/crates/wit-parser/tests/ui/comments.wit.json b/crates/wit-parser/tests/ui/comments.wit.json index 2f18314f36..f2a04f9d39 100644 --- a/crates/wit-parser/tests/ui/comments.wit.json +++ b/crates/wit-parser/tests/ui/comments.wit.json @@ -40,7 +40,6 @@ "packages": [ { "name": "foo:comments", - "kind": "Implicit", "interfaces": { "foo": 0 }, diff --git a/crates/wit-parser/tests/ui/complex-include.wit.json b/crates/wit-parser/tests/ui/complex-include.wit.json index 38b0df2172..f9b17f2792 100644 --- a/crates/wit-parser/tests/ui/complex-include.wit.json +++ b/crates/wit-parser/tests/ui/complex-include.wit.json @@ -165,7 +165,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": { "a": 0, "b": 1 @@ -176,7 +175,6 @@ }, { "name": "foo:baz", - "kind": "Implicit", "interfaces": { "a": 2, "b": 3 @@ -187,7 +185,6 @@ }, { "name": "foo:root", - "kind": "Implicit", "interfaces": { "ai": 4, "bi": 5 diff --git a/crates/wit-parser/tests/ui/cross-package-resource.wit.json b/crates/wit-parser/tests/ui/cross-package-resource.wit.json index f49163415e..51ab92795d 100644 --- a/crates/wit-parser/tests/ui/cross-package-resource.wit.json +++ b/crates/wit-parser/tests/ui/cross-package-resource.wit.json @@ -51,7 +51,6 @@ "packages": [ { "name": "some:dep", - "kind": "Implicit", "interfaces": { "foo": 0 }, @@ -59,7 +58,6 @@ }, { "name": "foo:bar", - "kind": "Implicit", "interfaces": { "foo": 1 }, diff --git a/crates/wit-parser/tests/ui/diamond1.wit.json b/crates/wit-parser/tests/ui/diamond1.wit.json index c524224815..54e87e7b04 100644 --- a/crates/wit-parser/tests/ui/diamond1.wit.json +++ b/crates/wit-parser/tests/ui/diamond1.wit.json @@ -36,7 +36,6 @@ "packages": [ { "name": "foo:dep1", - "kind": "Implicit", "interfaces": { "types": 0 }, @@ -44,7 +43,6 @@ }, { "name": "foo:dep2", - "kind": "Implicit", "interfaces": { "types": 1 }, @@ -52,7 +50,6 @@ }, { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0 diff --git a/crates/wit-parser/tests/ui/disambiguate-diamond.wit.json b/crates/wit-parser/tests/ui/disambiguate-diamond.wit.json index 47bfdbe8a2..34f675da51 100644 --- a/crates/wit-parser/tests/ui/disambiguate-diamond.wit.json +++ b/crates/wit-parser/tests/ui/disambiguate-diamond.wit.json @@ -103,7 +103,6 @@ "packages": [ { "name": "foo:diamond", - "kind": "Implicit", "interfaces": { "shared1": 0, "shared2": 1 diff --git a/crates/wit-parser/tests/ui/empty.wit.json b/crates/wit-parser/tests/ui/empty.wit.json index 00ba7a6102..092abe5e1d 100644 --- a/crates/wit-parser/tests/ui/empty.wit.json +++ b/crates/wit-parser/tests/ui/empty.wit.json @@ -5,7 +5,6 @@ "packages": [ { "name": "foo:empty", - "kind": "Implicit", "interfaces": {}, "worlds": {} } diff --git a/crates/wit-parser/tests/ui/feature-gates.wit.json b/crates/wit-parser/tests/ui/feature-gates.wit.json index 45490954b2..9cdb44c582 100644 --- a/crates/wit-parser/tests/ui/feature-gates.wit.json +++ b/crates/wit-parser/tests/ui/feature-gates.wit.json @@ -291,7 +291,6 @@ "packages": [ { "name": "a:b", - "kind": "Implicit", "interfaces": { "ungated": 0, "ungated2": 1, diff --git a/crates/wit-parser/tests/ui/foreign-deps-union.wit.json b/crates/wit-parser/tests/ui/foreign-deps-union.wit.json index 32cbd8e6fa..419d62e7ce 100644 --- a/crates/wit-parser/tests/ui/foreign-deps-union.wit.json +++ b/crates/wit-parser/tests/ui/foreign-deps-union.wit.json @@ -346,7 +346,6 @@ "packages": [ { "name": "foo:another-pkg", - "kind": "Implicit", "interfaces": { "other-interface": 0 }, @@ -354,7 +353,6 @@ }, { "name": "foo:corp", - "kind": "Implicit", "interfaces": { "saas": 1 }, @@ -362,7 +360,6 @@ }, { "name": "foo:different-pkg", - "kind": "Implicit", "interfaces": { "i": 2 }, @@ -370,7 +367,6 @@ }, { "name": "foo:foreign-pkg", - "kind": "Implicit", "interfaces": { "the-default": 3 }, @@ -378,7 +374,6 @@ }, { "name": "foo:some-pkg", - "kind": "Implicit", "interfaces": { "the-default": 4, "some-interface": 5, @@ -388,7 +383,6 @@ }, { "name": "foo:wasi", - "kind": "Implicit", "interfaces": { "clocks": 7, "filesystem": 8 @@ -399,7 +393,6 @@ }, { "name": "foo:root", - "kind": "Implicit", "interfaces": { "foo": 9, "bar": 10, diff --git a/crates/wit-parser/tests/ui/foreign-deps.wit.json b/crates/wit-parser/tests/ui/foreign-deps.wit.json index 132fcdd301..503c1b32c9 100644 --- a/crates/wit-parser/tests/ui/foreign-deps.wit.json +++ b/crates/wit-parser/tests/ui/foreign-deps.wit.json @@ -301,7 +301,6 @@ "packages": [ { "name": "foo:another-pkg", - "kind": "Implicit", "interfaces": { "other-interface": 0 }, @@ -309,7 +308,6 @@ }, { "name": "foo:corp", - "kind": "Implicit", "interfaces": { "saas": 1 }, @@ -317,7 +315,6 @@ }, { "name": "foo:different-pkg", - "kind": "Implicit", "interfaces": { "i": 2 }, @@ -325,7 +322,6 @@ }, { "name": "foo:foreign-pkg", - "kind": "Implicit", "interfaces": { "the-default": 3 }, @@ -333,7 +329,6 @@ }, { "name": "foo:some-pkg", - "kind": "Implicit", "interfaces": { "the-default": 4, "some-interface": 5, @@ -343,7 +338,6 @@ }, { "name": "foo:wasi", - "kind": "Implicit", "interfaces": { "clocks": 7, "filesystem": 8 @@ -352,7 +346,6 @@ }, { "name": "foo:root", - "kind": "Implicit", "interfaces": { "foo": 9, "bar": 10, diff --git a/crates/wit-parser/tests/ui/functions.wit.json b/crates/wit-parser/tests/ui/functions.wit.json index a5afc8eb43..902fe35709 100644 --- a/crates/wit-parser/tests/ui/functions.wit.json +++ b/crates/wit-parser/tests/ui/functions.wit.json @@ -157,7 +157,6 @@ "packages": [ { "name": "foo:functions", - "kind": "Implicit", "interfaces": { "functions": 0 }, diff --git a/crates/wit-parser/tests/ui/ignore-files-deps.wit.json b/crates/wit-parser/tests/ui/ignore-files-deps.wit.json index 27805e9468..7a812dbecf 100644 --- a/crates/wit-parser/tests/ui/ignore-files-deps.wit.json +++ b/crates/wit-parser/tests/ui/ignore-files-deps.wit.json @@ -25,7 +25,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": { "types": 0 }, @@ -33,7 +32,6 @@ }, { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0 diff --git a/crates/wit-parser/tests/ui/import-export-overlap1.wit.json b/crates/wit-parser/tests/ui/import-export-overlap1.wit.json index 77d0c44838..0c88a177b2 100644 --- a/crates/wit-parser/tests/ui/import-export-overlap1.wit.json +++ b/crates/wit-parser/tests/ui/import-export-overlap1.wit.json @@ -30,7 +30,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0 diff --git a/crates/wit-parser/tests/ui/import-export-overlap2.wit.json b/crates/wit-parser/tests/ui/import-export-overlap2.wit.json index 046c5af444..0c991269c5 100644 --- a/crates/wit-parser/tests/ui/import-export-overlap2.wit.json +++ b/crates/wit-parser/tests/ui/import-export-overlap2.wit.json @@ -34,7 +34,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0 diff --git a/crates/wit-parser/tests/ui/include-reps.wit.json b/crates/wit-parser/tests/ui/include-reps.wit.json index b77c9a640e..21debef2fe 100644 --- a/crates/wit-parser/tests/ui/include-reps.wit.json +++ b/crates/wit-parser/tests/ui/include-reps.wit.json @@ -55,7 +55,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "a": 0, "b": 1 diff --git a/crates/wit-parser/tests/ui/kebab-name-include-with.wit.json b/crates/wit-parser/tests/ui/kebab-name-include-with.wit.json index 64c15833dd..14c6d0d048 100644 --- a/crates/wit-parser/tests/ui/kebab-name-include-with.wit.json +++ b/crates/wit-parser/tests/ui/kebab-name-include-with.wit.json @@ -59,7 +59,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0, diff --git a/crates/wit-parser/tests/ui/kinds-of-deps.wit.json b/crates/wit-parser/tests/ui/kinds-of-deps.wit.json index d044bdd3ab..f13afe6301 100644 --- a/crates/wit-parser/tests/ui/kinds-of-deps.wit.json +++ b/crates/wit-parser/tests/ui/kinds-of-deps.wit.json @@ -58,7 +58,6 @@ "packages": [ { "name": "d:d", - "kind": "Implicit", "interfaces": { "d": 0 }, @@ -66,7 +65,6 @@ }, { "name": "e:e", - "kind": "Implicit", "interfaces": { "e": 1 }, @@ -74,7 +72,6 @@ }, { "name": "b:b", - "kind": "Implicit", "interfaces": { "b": 2 }, @@ -82,7 +79,6 @@ }, { "name": "c:c", - "kind": "Implicit", "interfaces": { "c": 3 }, @@ -90,7 +86,6 @@ }, { "name": "a:a", - "kind": "Implicit", "interfaces": {}, "worlds": { "a": 0 diff --git a/crates/wit-parser/tests/ui/many-names.wit.json b/crates/wit-parser/tests/ui/many-names.wit.json index 1c47f69f77..590c68471a 100644 --- a/crates/wit-parser/tests/ui/many-names.wit.json +++ b/crates/wit-parser/tests/ui/many-names.wit.json @@ -31,7 +31,6 @@ "packages": [ { "name": "foo:name", - "kind": "Implicit", "interfaces": { "x": 0 }, diff --git a/crates/wit-parser/tests/ui/multi-file-multi-package.wit.json b/crates/wit-parser/tests/ui/multi-file-multi-package.wit.json index a20a0c78ec..a2dea31719 100644 --- a/crates/wit-parser/tests/ui/multi-file-multi-package.wit.json +++ b/crates/wit-parser/tests/ui/multi-file-multi-package.wit.json @@ -212,7 +212,6 @@ "packages": [ { "name": "bar:name", - "kind": "Explicit", "interfaces": { "i2": 0 }, @@ -222,7 +221,6 @@ }, { "name": "baz:name", - "kind": "Explicit", "interfaces": { "i3": 2 }, @@ -232,7 +230,6 @@ }, { "name": "foo:name", - "kind": "Explicit", "interfaces": { "i1": 4 }, @@ -242,7 +239,6 @@ }, { "name": "qux:name", - "kind": "Explicit", "interfaces": { "i4": 6 }, diff --git a/crates/wit-parser/tests/ui/multi-file.wit.json b/crates/wit-parser/tests/ui/multi-file.wit.json index 6da127c468..45af0f5d32 100644 --- a/crates/wit-parser/tests/ui/multi-file.wit.json +++ b/crates/wit-parser/tests/ui/multi-file.wit.json @@ -283,7 +283,6 @@ "packages": [ { "name": "foo:multi-file", - "kind": "Implicit", "interfaces": { "irrelevant-name": 0, "depend-on-me": 1, diff --git a/crates/wit-parser/tests/ui/multi-package-shared-deps.wit.json b/crates/wit-parser/tests/ui/multi-package-shared-deps.wit.json index 43cd97987a..d3434da0c5 100644 --- a/crates/wit-parser/tests/ui/multi-package-shared-deps.wit.json +++ b/crates/wit-parser/tests/ui/multi-package-shared-deps.wit.json @@ -53,7 +53,6 @@ "packages": [ { "name": "foo:dep1", - "kind": "Implicit", "interfaces": { "types": 0 }, @@ -61,7 +60,6 @@ }, { "name": "foo:dep2", - "kind": "Implicit", "interfaces": { "types": 1 }, @@ -69,7 +67,6 @@ }, { "name": "foo:bar", - "kind": "Explicit", "interfaces": {}, "worlds": { "w-bar": 0 @@ -77,7 +74,6 @@ }, { "name": "foo:qux", - "kind": "Explicit", "interfaces": {}, "worlds": { "w-qux": 1 diff --git a/crates/wit-parser/tests/ui/multi-package-transitive-deps.wit.json b/crates/wit-parser/tests/ui/multi-package-transitive-deps.wit.json index 0fdb4dd5a9..ece4cdade9 100644 --- a/crates/wit-parser/tests/ui/multi-package-transitive-deps.wit.json +++ b/crates/wit-parser/tests/ui/multi-package-transitive-deps.wit.json @@ -86,7 +86,6 @@ "packages": [ { "name": "foo:dep2", - "kind": "Implicit", "interfaces": { "types": 0 }, @@ -94,7 +93,6 @@ }, { "name": "foo:dep1", - "kind": "Implicit", "interfaces": { "types": 1 }, @@ -102,7 +100,6 @@ }, { "name": "foo:bar", - "kind": "Explicit", "interfaces": {}, "worlds": { "w-bar": 0 @@ -110,7 +107,6 @@ }, { "name": "foo:qux", - "kind": "Explicit", "interfaces": {}, "worlds": { "w-qux": 1 diff --git a/crates/wit-parser/tests/ui/name-both-resource-and-type.wit.json b/crates/wit-parser/tests/ui/name-both-resource-and-type.wit.json index ac93129918..1dad5120b5 100644 --- a/crates/wit-parser/tests/ui/name-both-resource-and-type.wit.json +++ b/crates/wit-parser/tests/ui/name-both-resource-and-type.wit.json @@ -73,7 +73,6 @@ "packages": [ { "name": "some:dep", - "kind": "Implicit", "interfaces": { "foo": 0 }, @@ -81,7 +80,6 @@ }, { "name": "foo:bar", - "kind": "Implicit", "interfaces": { "foo": 1 }, diff --git a/crates/wit-parser/tests/ui/package-syntax1.wit.json b/crates/wit-parser/tests/ui/package-syntax1.wit.json index 5bf7712909..80af0cbb3b 100644 --- a/crates/wit-parser/tests/ui/package-syntax1.wit.json +++ b/crates/wit-parser/tests/ui/package-syntax1.wit.json @@ -5,7 +5,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": {} } diff --git a/crates/wit-parser/tests/ui/package-syntax3.wit.json b/crates/wit-parser/tests/ui/package-syntax3.wit.json index 8ff0a1ea2a..e0323c511b 100644 --- a/crates/wit-parser/tests/ui/package-syntax3.wit.json +++ b/crates/wit-parser/tests/ui/package-syntax3.wit.json @@ -5,7 +5,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": {}, "worlds": {} } diff --git a/crates/wit-parser/tests/ui/package-syntax4.wit.json b/crates/wit-parser/tests/ui/package-syntax4.wit.json index 280678ddd5..7bacc86f03 100644 --- a/crates/wit-parser/tests/ui/package-syntax4.wit.json +++ b/crates/wit-parser/tests/ui/package-syntax4.wit.json @@ -5,7 +5,6 @@ "packages": [ { "name": "foo:bar@2.0.0", - "kind": "Implicit", "interfaces": {}, "worlds": {} } diff --git a/crates/wit-parser/tests/ui/packages-explicit-colliding-decl-names.wit.json b/crates/wit-parser/tests/ui/packages-explicit-colliding-decl-names.wit.json index 3b925bee34..f4c9e7055c 100644 --- a/crates/wit-parser/tests/ui/packages-explicit-colliding-decl-names.wit.json +++ b/crates/wit-parser/tests/ui/packages-explicit-colliding-decl-names.wit.json @@ -110,7 +110,6 @@ "packages": [ { "name": "bar:name", - "kind": "Explicit", "interfaces": { "i": 0 }, @@ -120,7 +119,6 @@ }, { "name": "foo:name", - "kind": "Explicit", "interfaces": { "i": 2 }, diff --git a/crates/wit-parser/tests/ui/packages-explicit-internal-references.wit.json b/crates/wit-parser/tests/ui/packages-explicit-internal-references.wit.json index 8edc232bd2..1d59a07e3a 100644 --- a/crates/wit-parser/tests/ui/packages-explicit-internal-references.wit.json +++ b/crates/wit-parser/tests/ui/packages-explicit-internal-references.wit.json @@ -71,7 +71,6 @@ "packages": [ { "name": "foo:name", - "kind": "Explicit", "interfaces": { "i1": 0 }, @@ -79,7 +78,6 @@ }, { "name": "bar:name", - "kind": "Explicit", "interfaces": {}, "worlds": { "w1": 0 diff --git a/crates/wit-parser/tests/ui/packages-explicit-with-semver.wit.json b/crates/wit-parser/tests/ui/packages-explicit-with-semver.wit.json index fdbd064be1..23a10462aa 100644 --- a/crates/wit-parser/tests/ui/packages-explicit-with-semver.wit.json +++ b/crates/wit-parser/tests/ui/packages-explicit-with-semver.wit.json @@ -110,7 +110,6 @@ "packages": [ { "name": "foo:name@1.0.0", - "kind": "Explicit", "interfaces": { "i1": 0 }, @@ -120,7 +119,6 @@ }, { "name": "foo:name@1.0.1", - "kind": "Explicit", "interfaces": { "i1": 2 }, diff --git a/crates/wit-parser/tests/ui/packages-multiple-explicit.wit.json b/crates/wit-parser/tests/ui/packages-multiple-explicit.wit.json index c770931d30..de73c51de3 100644 --- a/crates/wit-parser/tests/ui/packages-multiple-explicit.wit.json +++ b/crates/wit-parser/tests/ui/packages-multiple-explicit.wit.json @@ -110,7 +110,6 @@ "packages": [ { "name": "bar:name", - "kind": "Explicit", "interfaces": { "i2": 0 }, @@ -120,7 +119,6 @@ }, { "name": "foo:name", - "kind": "Explicit", "interfaces": { "i1": 2 }, diff --git a/crates/wit-parser/tests/ui/packages-single-explicit.wit.json b/crates/wit-parser/tests/ui/packages-single-explicit.wit.json index 667eadfdaa..3eefde2810 100644 --- a/crates/wit-parser/tests/ui/packages-single-explicit.wit.json +++ b/crates/wit-parser/tests/ui/packages-single-explicit.wit.json @@ -59,7 +59,6 @@ "packages": [ { "name": "foo:name", - "kind": "Explicit", "interfaces": { "i1": 0 }, diff --git a/crates/wit-parser/tests/ui/random.wit.json b/crates/wit-parser/tests/ui/random.wit.json index 977e824bb1..5d46664671 100644 --- a/crates/wit-parser/tests/ui/random.wit.json +++ b/crates/wit-parser/tests/ui/random.wit.json @@ -55,7 +55,6 @@ "packages": [ { "name": "wasi:random", - "kind": "Implicit", "interfaces": { "random": 0 }, diff --git a/crates/wit-parser/tests/ui/resources-empty.wit.json b/crates/wit-parser/tests/ui/resources-empty.wit.json index 2adbff8138..6c40c61dfc 100644 --- a/crates/wit-parser/tests/ui/resources-empty.wit.json +++ b/crates/wit-parser/tests/ui/resources-empty.wit.json @@ -63,7 +63,6 @@ "packages": [ { "name": "foo:resources-empty", - "kind": "Implicit", "interfaces": { "resources-empty": 0 }, diff --git a/crates/wit-parser/tests/ui/resources-multiple-returns-own.wit.json b/crates/wit-parser/tests/ui/resources-multiple-returns-own.wit.json index f0bd001ecc..e7234f7ed8 100644 --- a/crates/wit-parser/tests/ui/resources-multiple-returns-own.wit.json +++ b/crates/wit-parser/tests/ui/resources-multiple-returns-own.wit.json @@ -74,7 +74,6 @@ "packages": [ { "name": "foo:resources1", - "kind": "Implicit", "interfaces": { "resources1": 0 }, diff --git a/crates/wit-parser/tests/ui/resources-multiple.wit.json b/crates/wit-parser/tests/ui/resources-multiple.wit.json index 9a54b96240..2914ab99d9 100644 --- a/crates/wit-parser/tests/ui/resources-multiple.wit.json +++ b/crates/wit-parser/tests/ui/resources-multiple.wit.json @@ -272,7 +272,6 @@ "packages": [ { "name": "foo:resources-multiple", - "kind": "Implicit", "interfaces": { "resources-multiple": 0 }, diff --git a/crates/wit-parser/tests/ui/resources-return-own.wit.json b/crates/wit-parser/tests/ui/resources-return-own.wit.json index 0b2f0103d8..3e44fc106c 100644 --- a/crates/wit-parser/tests/ui/resources-return-own.wit.json +++ b/crates/wit-parser/tests/ui/resources-return-own.wit.json @@ -69,7 +69,6 @@ "packages": [ { "name": "foo:resources1", - "kind": "Implicit", "interfaces": { "resources1": 0 }, diff --git a/crates/wit-parser/tests/ui/resources.wit.json b/crates/wit-parser/tests/ui/resources.wit.json index 28b845fd30..169fb02110 100644 --- a/crates/wit-parser/tests/ui/resources.wit.json +++ b/crates/wit-parser/tests/ui/resources.wit.json @@ -328,7 +328,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": { "foo": 0, "i": 1 diff --git a/crates/wit-parser/tests/ui/resources1.wit.json b/crates/wit-parser/tests/ui/resources1.wit.json index 1883d6f6ef..447e5ec2b9 100644 --- a/crates/wit-parser/tests/ui/resources1.wit.json +++ b/crates/wit-parser/tests/ui/resources1.wit.json @@ -87,7 +87,6 @@ "packages": [ { "name": "foo:resources1", - "kind": "Implicit", "interfaces": { "resources1": 0 }, diff --git a/crates/wit-parser/tests/ui/same-name-import-export.wit.json b/crates/wit-parser/tests/ui/same-name-import-export.wit.json index a440e633d3..3cf1798d93 100644 --- a/crates/wit-parser/tests/ui/same-name-import-export.wit.json +++ b/crates/wit-parser/tests/ui/same-name-import-export.wit.json @@ -38,7 +38,6 @@ "packages": [ { "name": "demo:greeter", - "kind": "Implicit", "interfaces": {}, "worlds": { "greeter": 0 diff --git a/crates/wit-parser/tests/ui/shared-types.wit.json b/crates/wit-parser/tests/ui/shared-types.wit.json index 7a0875d84e..569f6d3861 100644 --- a/crates/wit-parser/tests/ui/shared-types.wit.json +++ b/crates/wit-parser/tests/ui/shared-types.wit.json @@ -78,7 +78,6 @@ "packages": [ { "name": "foo:shared-items", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0 diff --git a/crates/wit-parser/tests/ui/simple-wasm-text.wit.json b/crates/wit-parser/tests/ui/simple-wasm-text.wit.json index 5e575b16c1..969c13a506 100644 --- a/crates/wit-parser/tests/ui/simple-wasm-text.wit.json +++ b/crates/wit-parser/tests/ui/simple-wasm-text.wit.json @@ -12,7 +12,6 @@ "packages": [ { "name": "a:b", - "kind": "Implicit", "interfaces": { "x": 0 }, diff --git a/crates/wit-parser/tests/ui/since-and-unstable.wit.json b/crates/wit-parser/tests/ui/since-and-unstable.wit.json index c27dad3e43..31c4fa0c4b 100644 --- a/crates/wit-parser/tests/ui/since-and-unstable.wit.json +++ b/crates/wit-parser/tests/ui/since-and-unstable.wit.json @@ -566,7 +566,6 @@ "packages": [ { "name": "a:b@1.0.1", - "kind": "Implicit", "interfaces": { "foo1": 0, "foo2": 1, diff --git a/crates/wit-parser/tests/ui/stress-export-elaborate.wit.json b/crates/wit-parser/tests/ui/stress-export-elaborate.wit.json index 55d6f68e0b..d77812776b 100644 --- a/crates/wit-parser/tests/ui/stress-export-elaborate.wit.json +++ b/crates/wit-parser/tests/ui/stress-export-elaborate.wit.json @@ -1136,7 +1136,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": { "i1": 0, "i2": 1, diff --git a/crates/wit-parser/tests/ui/type-then-eof.wit.json b/crates/wit-parser/tests/ui/type-then-eof.wit.json index 85a5688d5e..beb0a7adca 100644 --- a/crates/wit-parser/tests/ui/type-then-eof.wit.json +++ b/crates/wit-parser/tests/ui/type-then-eof.wit.json @@ -23,7 +23,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "foo": 0 }, diff --git a/crates/wit-parser/tests/ui/types.wit.json b/crates/wit-parser/tests/ui/types.wit.json index d428f7f671..8874e3541d 100644 --- a/crates/wit-parser/tests/ui/types.wit.json +++ b/crates/wit-parser/tests/ui/types.wit.json @@ -765,7 +765,6 @@ "packages": [ { "name": "foo:types", - "kind": "Implicit", "interfaces": { "types": 0 }, diff --git a/crates/wit-parser/tests/ui/union-fuzz-1.wit.json b/crates/wit-parser/tests/ui/union-fuzz-1.wit.json index 705cd46134..31c7c82687 100644 --- a/crates/wit-parser/tests/ui/union-fuzz-1.wit.json +++ b/crates/wit-parser/tests/ui/union-fuzz-1.wit.json @@ -24,7 +24,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": {}, "worlds": { "xo": 0, diff --git a/crates/wit-parser/tests/ui/union-fuzz-2.wit.json b/crates/wit-parser/tests/ui/union-fuzz-2.wit.json index c722de0429..6d1bc4ffd4 100644 --- a/crates/wit-parser/tests/ui/union-fuzz-2.wit.json +++ b/crates/wit-parser/tests/ui/union-fuzz-2.wit.json @@ -62,7 +62,6 @@ "packages": [ { "name": "foo:bar", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0, diff --git a/crates/wit-parser/tests/ui/use-chain.wit.json b/crates/wit-parser/tests/ui/use-chain.wit.json index 824f2e646e..bd942bb8cd 100644 --- a/crates/wit-parser/tests/ui/use-chain.wit.json +++ b/crates/wit-parser/tests/ui/use-chain.wit.json @@ -43,7 +43,6 @@ "packages": [ { "name": "foo:name", - "kind": "Implicit", "interfaces": { "foo": 0, "name": 1 diff --git a/crates/wit-parser/tests/ui/use.wit.json b/crates/wit-parser/tests/ui/use.wit.json index c3dce34734..43cc16b4a7 100644 --- a/crates/wit-parser/tests/ui/use.wit.json +++ b/crates/wit-parser/tests/ui/use.wit.json @@ -157,7 +157,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "bar": 0, "foo": 1, diff --git a/crates/wit-parser/tests/ui/versions.wit.json b/crates/wit-parser/tests/ui/versions.wit.json index daaaf6fec0..febd55be51 100644 --- a/crates/wit-parser/tests/ui/versions.wit.json +++ b/crates/wit-parser/tests/ui/versions.wit.json @@ -68,7 +68,6 @@ "packages": [ { "name": "a:a@1.0.0", - "kind": "Implicit", "interfaces": { "foo": 0 }, @@ -76,7 +75,6 @@ }, { "name": "a:a@2.0.0", - "kind": "Implicit", "interfaces": { "foo": 1 }, @@ -84,7 +82,6 @@ }, { "name": "foo:versions", - "kind": "Implicit", "interfaces": { "foo": 2 }, diff --git a/crates/wit-parser/tests/ui/wasi.wit.json b/crates/wit-parser/tests/ui/wasi.wit.json index c0fa5b6ba3..e784fbd207 100644 --- a/crates/wit-parser/tests/ui/wasi.wit.json +++ b/crates/wit-parser/tests/ui/wasi.wit.json @@ -530,7 +530,6 @@ "packages": [ { "name": "wasi:filesystem", - "kind": "Implicit", "interfaces": { "wasi": 0 }, diff --git a/crates/wit-parser/tests/ui/world-diamond.wit.json b/crates/wit-parser/tests/ui/world-diamond.wit.json index e5155cdc76..6dba45edb9 100644 --- a/crates/wit-parser/tests/ui/world-diamond.wit.json +++ b/crates/wit-parser/tests/ui/world-diamond.wit.json @@ -111,7 +111,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "shared-items": 0, "i1": 1, diff --git a/crates/wit-parser/tests/ui/world-iface-no-collide.wit.json b/crates/wit-parser/tests/ui/world-iface-no-collide.wit.json index 2417a6adae..fffc11557e 100644 --- a/crates/wit-parser/tests/ui/world-iface-no-collide.wit.json +++ b/crates/wit-parser/tests/ui/world-iface-no-collide.wit.json @@ -57,7 +57,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "foo": 0 }, diff --git a/crates/wit-parser/tests/ui/world-implicit-import1.wit.json b/crates/wit-parser/tests/ui/world-implicit-import1.wit.json index d155847021..708c339b40 100644 --- a/crates/wit-parser/tests/ui/world-implicit-import1.wit.json +++ b/crates/wit-parser/tests/ui/world-implicit-import1.wit.json @@ -70,7 +70,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "foo": 0 }, diff --git a/crates/wit-parser/tests/ui/world-implicit-import2.wit.json b/crates/wit-parser/tests/ui/world-implicit-import2.wit.json index d48070dead..97049842a4 100644 --- a/crates/wit-parser/tests/ui/world-implicit-import2.wit.json +++ b/crates/wit-parser/tests/ui/world-implicit-import2.wit.json @@ -61,7 +61,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "foo": 0 }, diff --git a/crates/wit-parser/tests/ui/world-implicit-import3.wit.json b/crates/wit-parser/tests/ui/world-implicit-import3.wit.json index 3fd6405789..159bee7738 100644 --- a/crates/wit-parser/tests/ui/world-implicit-import3.wit.json +++ b/crates/wit-parser/tests/ui/world-implicit-import3.wit.json @@ -62,7 +62,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "foo": 0 }, diff --git a/crates/wit-parser/tests/ui/world-same-fields4.wit.json b/crates/wit-parser/tests/ui/world-same-fields4.wit.json index b7eac1c81b..3be16acf9b 100644 --- a/crates/wit-parser/tests/ui/world-same-fields4.wit.json +++ b/crates/wit-parser/tests/ui/world-same-fields4.wit.json @@ -71,7 +71,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "shared-items": 0 }, diff --git a/crates/wit-parser/tests/ui/world-top-level-funcs.wit.json b/crates/wit-parser/tests/ui/world-top-level-funcs.wit.json index 0c164071ec..b7866aa12d 100644 --- a/crates/wit-parser/tests/ui/world-top-level-funcs.wit.json +++ b/crates/wit-parser/tests/ui/world-top-level-funcs.wit.json @@ -77,7 +77,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": {}, "worlds": { "foo": 0 diff --git a/crates/wit-parser/tests/ui/world-top-level-resources.wit.json b/crates/wit-parser/tests/ui/world-top-level-resources.wit.json index 4ba6711832..794e699f45 100644 --- a/crates/wit-parser/tests/ui/world-top-level-resources.wit.json +++ b/crates/wit-parser/tests/ui/world-top-level-resources.wit.json @@ -225,7 +225,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "types": 0, "handler": 1 diff --git a/crates/wit-parser/tests/ui/worlds-union-dedup.wit.json b/crates/wit-parser/tests/ui/worlds-union-dedup.wit.json index e1d37c8927..d1e24e97b6 100644 --- a/crates/wit-parser/tests/ui/worlds-union-dedup.wit.json +++ b/crates/wit-parser/tests/ui/worlds-union-dedup.wit.json @@ -94,7 +94,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "a1": 0, "a2": 1, diff --git a/crates/wit-parser/tests/ui/worlds-with-types.wit.json b/crates/wit-parser/tests/ui/worlds-with-types.wit.json index fed7ae5e77..70e857d68b 100644 --- a/crates/wit-parser/tests/ui/worlds-with-types.wit.json +++ b/crates/wit-parser/tests/ui/worlds-with-types.wit.json @@ -191,7 +191,6 @@ "packages": [ { "name": "foo:foo", - "kind": "Implicit", "interfaces": { "disambiguate": 0 },