wasmtime 21.0.1 → 23.0.2

data/ext/cargo-vendor/wit-parser-0.207.0/src/ast/resolve.rs

@@ -1,1442 +0,0 @@
-use super::{ParamList, ResultList, WorldOrInterface};
-use crate::ast::toposort::toposort;
-use crate::*;
-use anyhow::bail;
-use std::collections::{HashMap, HashSet};
-use std::mem;
-
-#[derive(Default)]
-pub struct Resolver<'a> {
-    /// Current package name learned through the ASTs pushed onto this resolver.
-    package_name: Option<PackageName>,
-
-    /// Package docs.
-    package_docs: Docs,
-
-    /// All WIT files which are going to be resolved together.
-    asts: Vec<ast::Ast<'a>>,
-
-    // Arenas that get plumbed to the final `UnresolvedPackage`
-    types: Arena<TypeDef>,
-    interfaces: Arena<Interface>,
-    worlds: Arena<World>,
-
-    // Interning structure for types which-need-not-be-named such as
-    // `list<string>` and such.
-    anon_types: HashMap<Key, TypeId>,
-
-    /// The index within `self.ast_items` that lookups should go through. This
-    /// is updated as the ASTs are walked.
-    cur_ast_index: usize,
-
-    /// A map per `ast::Ast` which keeps track of the file's top level names in
-    /// scope. This maps each name onto either a world or an interface, handling
-    /// things like `use` at the top level.
-    ast_items: Vec<IndexMap<&'a str, AstItem>>,
-
-    /// A map for the entire package being created of all names defined within,
-    /// along with the ID they're mapping to.
-    package_items: IndexMap<&'a str, AstItem>,
-
-    /// A per-interface map of name to item-in-the-interface. This is the same
-    /// length as `self.types` and is pushed to whenever `self.types` is pushed
-    /// to.
-    interface_types: Vec<IndexMap<&'a str, (TypeOrItem, Span)>>,
-
-    /// Metadata about foreign dependencies which are not defined in this
-    /// package. This map is keyed by the name of the package being imported
-    /// from. The next level of key is the name of the interface being imported
-    /// from, and the final value is the assigned ID of the interface.
-    foreign_deps: IndexMap<PackageName, IndexMap<&'a str, AstItem>>,
-
-    /// All interfaces that are present within `self.foreign_deps`.
-    foreign_interfaces: HashSet<InterfaceId>,
-
-    foreign_worlds: HashSet<WorldId>,
-
-    /// The current type lookup scope which will eventually make its way into
-    /// `self.interface_types`.
-    type_lookup: IndexMap<&'a str, (TypeOrItem, Span)>,
-
-    /// An assigned span for where all types inserted into `self.types` as
-    /// imported from foreign interfaces. These types all show up first in the
-    /// `self.types` arena and this span is used to generate an error message
-    /// pointing to it if the item isn't actually defined.
-    unknown_type_spans: Vec<Span>,
-
-    /// Spans for each world in `self.world`
-    world_spans: Vec<WorldSpan>,
-
-    /// The span of each interface's definition which is used for error
-    /// reporting during the final `Resolve` phase.
-    interface_spans: Vec<InterfaceSpan>,
-
-    /// Spans per entry in `self.foreign_deps` for where the dependency was
-    /// introduced to print an error message if necessary.
-    foreign_dep_spans: Vec<Span>,
-
-    /// A list of `TypeDefKind::Unknown` types which are required to be
-    /// resources when this package is resolved against its dependencies.
-    required_resource_types: Vec<(TypeId, Span)>,
-}
-
-#[derive(PartialEq, Eq, Hash)]
-enum Key {
-    Variant(Vec<(String, Option<Type>)>),
-    BorrowHandle(TypeId),
-    Record(Vec<(String, Type)>),
-    Flags(Vec<String>),
-    Tuple(Vec<Type>),
-    Enum(Vec<String>),
-    List(Type),
-    Option(Type),
-    Result(Option<Type>, Option<Type>),
-    Future(Option<Type>),
-    Stream(Option<Type>, Option<Type>),
-}
-
-enum TypeItem<'a, 'b> {
-    Use(&'b ast::Use<'a>),
-    Def(&'b ast::TypeDef<'a>),
-}
-
-enum TypeOrItem {
-    Type(TypeId),
-    Item(&'static str),
-}
-
-impl<'a> Resolver<'a> {
-    pub(crate) fn push(&mut self, ast: ast::Ast<'a>) -> Result<()> {
-        // As each WIT file is pushed into this resolver keep track of the
-        // current package name assigned. Only one file needs to mention it, but
-        // if multiple mention it then they must all match.
-        if let Some(cur) = &ast.package_id {
-            let cur_name = cur.package_name();
-            if let Some(prev) = &self.package_name {
-                if cur_name != *prev {
-                    bail!(Error {
-                        span: cur.span,
-                        msg: format!(
-                            "package identifier `{cur_name}` does not match \
-                             previous package name of `{prev}`"
-                        ),
-                    })
-                }
-            }
-            self.package_name = Some(cur_name);
-
-            // At most one 'package' item can have doc comments.
-            let docs = self.docs(&cur.docs);
-            if docs.contents.is_some() {
-                if self.package_docs.contents.is_some() {
-                    bail!(Error {
-                        span: cur.docs.span,
-                        msg: "found doc comments on multiple 'package' items".into(),
-                    })
-                }
-                self.package_docs = docs;
-            }
-        }
-        self.asts.push(ast);
-        Ok(())
-    }
-
-    pub(crate) fn resolve(&mut self) -> Result<UnresolvedPackage> {
-        // At least one of the WIT files must have a `package` annotation.
-        let name = match &self.package_name {
-            Some(name) => name.clone(),
-            None => bail!("no `package` header was found in any WIT file for this package"),
-        };
-
-        // First populate information about foreign dependencies and the general
-        // structure of the package. This should resolve the "base" of many
-        // `use` statements and additionally generate a topological ordering of
-        // all interfaces in the package to visit.
-        let asts = mem::take(&mut self.asts);
-        self.populate_foreign_deps(&asts);
-        let (iface_order, world_order) = self.populate_ast_items(&asts)?;
-        self.populate_foreign_types(&asts)?;
-
-        // Use the topological ordering of all interfaces to resolve all
-        // interfaces in-order. Note that a reverse-mapping from ID to AST is
-        // generated here to assist with this.
-        let mut iface_id_to_ast = IndexMap::new();
-        let mut world_id_to_ast = IndexMap::new();
-        for (i, ast) in asts.iter().enumerate() {
-            for item in ast.items.iter() {
-                match item {
-                    ast::AstItem::Interface(iface) => {
-                        let id = match self.ast_items[i][iface.name.name] {
-                            AstItem::Interface(id) => id,
-                            AstItem::World(_) => unreachable!(),
-                        };
-                        iface_id_to_ast.insert(id, (iface, i));
-                    }
-                    ast::AstItem::World(world) => {
-                        let id = match self.ast_items[i][world.name.name] {
-                            AstItem::World(id) => id,
-                            AstItem::Interface(_) => unreachable!(),
-                        };
-                        world_id_to_ast.insert(id, (world, i));
-                    }
-                    ast::AstItem::Use(_) => {}
-                }
-            }
-        }
-
-        for id in iface_order {
-            let (interface, i) = &iface_id_to_ast[&id];
-            self.cur_ast_index = *i;
-            self.resolve_interface(id, &interface.items, &interface.docs)?;
-        }
-
-        for id in world_order {
-            let (world, i) = &world_id_to_ast[&id];
-            self.cur_ast_index = *i;
-            self.resolve_world(id, world)?;
-        }
-
-        Ok(UnresolvedPackage {
-            name,
-            docs: mem::take(&mut self.package_docs),
-            worlds: mem::take(&mut self.worlds),
-            types: mem::take(&mut self.types),
-            interfaces: mem::take(&mut self.interfaces),
-            foreign_deps: self
-                .foreign_deps
-                .iter()
-                .map(|(name, deps)| {
-                    (
-                        name.clone(),
-                        deps.iter()
-                            .map(|(name, id)| (name.to_string(), *id))
-                            .collect(),
-                    )
-                })
-                .collect(),
-            unknown_type_spans: mem::take(&mut self.unknown_type_spans),
-            interface_spans: mem::take(&mut self.interface_spans),
-            world_spans: mem::take(&mut self.world_spans),
-            foreign_dep_spans: mem::take(&mut self.foreign_dep_spans),
-            source_map: SourceMap::default(),
-            required_resource_types: mem::take(&mut self.required_resource_types),
-        })
-    }
-
-    /// 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, asts: &[ast::Ast<'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 ast in asts {
-            ast.for_each_path(|_, path, _names, world_or_iface| {
-                let (id, name) = match path {
-                    ast::UsePath::Package { id, name } => (id, name),
-                    _ => return Ok(()),
-                };
-
-                let deps = foreign_deps.entry(id.package_name()).or_insert_with(|| {
-                    self.foreign_dep_spans.push(id.span);
-                    IndexMap::new()
-                });
-                let id = *deps.entry(name.name).or_insert_with(|| {
-                    match world_or_iface {
-                        WorldOrInterface::World => {
-                            log::trace!(
-                                "creating a world for foreign dep: {}/{}",
-                                id.package_name(),
-                                name.name
-                            );
-                            AstItem::World(self.alloc_world(name.span))
-                        }
-                        WorldOrInterface::Interface | WorldOrInterface::Unknown => {
-                            // Currently top-level `use` always assumes an interface, so the
-                            // `Unknown` case is the same as `Interface`.
-                            log::trace!(
-                                "creating an interface for foreign dep: {}/{}",
-                                id.package_name(),
-                                name.name
-                            );
-                            AstItem::Interface(self.alloc_interface(name.span))
-                        }
-                    }
-                });
-
-                let _ = match id {
-                    AstItem::Interface(id) => foreign_interfaces.insert(id),
-                    AstItem::World(id) => foreign_worlds.insert(id),
-                };
-
-                Ok(())
-            })
-            .unwrap();
-        }
-        self.foreign_deps = foreign_deps;
-        self.foreign_interfaces = foreign_interfaces;
-        self.foreign_worlds = foreign_worlds;
-    }
-
-    fn alloc_interface(&mut self, span: Span) -> InterfaceId {
-        self.interface_types.push(IndexMap::new());
-        self.interface_spans.push(InterfaceSpan {
-            span,
-            funcs: Vec::new(),
-        });
-        self.interfaces.alloc(Interface {
-            name: None,
-            types: IndexMap::new(),
-            docs: Docs::default(),
-            functions: IndexMap::new(),
-            package: None,
-        })
-    }
-
-    fn alloc_world(&mut self, span: Span) -> WorldId {
-        self.world_spans.push(WorldSpan {
-            span,
-            imports: Vec::new(),
-            exports: Vec::new(),
-            includes: Vec::new(),
-        });
-        self.worlds.alloc(World {
-            name: String::new(),
-            docs: Docs::default(),
-            exports: IndexMap::new(),
-            imports: IndexMap::new(),
-            package: None,
-            includes: Default::default(),
-            include_names: Default::default(),
-        })
-    }
-
-    /// This method will create a `World` and an `Interface` for all items
-    /// present in the specified set of ASTs. Additionally maps for each AST are
-    /// generated for resolving use-paths later on.
-    fn populate_ast_items(
-        &mut self,
-        asts: &[ast::Ast<'a>],
-    ) -> Result<(Vec<InterfaceId>, Vec<WorldId>)> {
-        let mut package_items = IndexMap::new();
-
-        // Validate that all worlds and interfaces have unique names within this
-        // package across all ASTs which make up the package.
-        let mut names = HashMap::new();
-        let mut ast_namespaces = Vec::new();
-        let mut order = IndexMap::new();
-        for ast in asts {
-            let mut ast_ns = IndexMap::new();
-            for item in ast.items.iter() {
-                match item {
-                    ast::AstItem::Interface(i) => {
-                        if package_items.insert(i.name.name, i.name.span).is_some() {
-                            bail!(Error {
-                                span: i.name.span,
-                                msg: format!("duplicate item named `{}`", i.name.name),
-                            })
-                        }
-                        let prev = ast_ns.insert(i.name.name, ());
-                        assert!(prev.is_none());
-                        let prev = order.insert(i.name.name, Vec::new());
-                        assert!(prev.is_none());
-                        let prev = names.insert(i.name.name, item);
-                        assert!(prev.is_none());
-                    }
-                    ast::AstItem::World(w) => {
-                        if package_items.insert(w.name.name, w.name.span).is_some() {
-                            bail!(Error {
-                                span: w.name.span,
-                                msg: format!("duplicate item named `{}`", w.name.name),
-                            })
-                        }
-                        let prev = ast_ns.insert(w.name.name, ());
-                        assert!(prev.is_none());
-                        let prev = order.insert(w.name.name, Vec::new());
-                        assert!(prev.is_none());
-                        let prev = names.insert(w.name.name, item);
-                        assert!(prev.is_none());
-                    }
-                    // These are processed down below.
-                    ast::AstItem::Use(_) => {}
-                }
-            }
-            ast_namespaces.push(ast_ns);
-        }
-
-        // Next record dependencies between interfaces as induced via `use`
-        // paths. This step is used to perform a topological sort of all
-        // interfaces to ensure there are no cycles and to generate an ordering
-        // which we can resolve in.
-        enum ItemSource<'a> {
-            Foreign,
-            Local(ast::Id<'a>),
-        }
-
-        for ast in asts {
-            // Record, in the context of this file, what all names are defined
-            // at the top level and whether they point to other items in this
-            // package or foreign items. Foreign deps are ignored for
-            // topological ordering.
-            let mut ast_ns = IndexMap::new();
-            for item in ast.items.iter() {
-                let (name, src) = match item {
-                    ast::AstItem::Use(u) => {
-                        let name = u.as_.as_ref().unwrap_or(u.item.name());
-                        let src = match &u.item {
-                            ast::UsePath::Id(id) => ItemSource::Local(id.clone()),
-                            ast::UsePath::Package { .. } => ItemSource::Foreign,
-                        };
-                        (name, src)
-                    }
-                    ast::AstItem::Interface(i) => (&i.name, ItemSource::Local(i.name.clone())),
-                    ast::AstItem::World(w) => (&w.name, ItemSource::Local(w.name.clone())),
-                };
-                if ast_ns.insert(name.name, (name.span, src)).is_some() {
-                    bail!(Error {
-                        span: name.span,
-                        msg: format!("duplicate name `{}` in this file", name.name),
-                    });
-                }
-            }
-
-            // With this file's namespace information look at all `use` paths
-            // and record dependencies between interfaces.
-            ast.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.
-                let iface = match iface {
-                    Some(name) => name,
-                    None => return Ok(()),
-                };
-                let used_name = match path {
-                    ast::UsePath::Id(id) => id,
-                    ast::UsePath::Package { .. } => return Ok(()),
-                };
-                match ast_ns.get(used_name.name) {
-                    Some((_, ItemSource::Foreign)) => return Ok(()),
-                    Some((_, ItemSource::Local(id))) => {
-                        order[iface.name].push(id.clone());
-                    }
-                    None => match package_items.get(used_name.name) {
-                        Some(_) => {
-                            order[iface.name].push(used_name.clone());
-                        }
-                        None => {
-                            bail!(Error {
-                                span: used_name.span,
-                                msg: format!(
-                                    "interface or world `{name}` not found in package",
-                                    name = used_name.name
-                                ),
-                            })
-                        }
-                    },
-                }
-                Ok(())
-            })?;
-        }
-
-        let order = toposort("interface or world", &order)?;
-        log::debug!("toposort for interfaces and worlds in order: {:?}", order);
-
-        // Allocate interfaces in-order now that the ordering is defined. This
-        // is then used to build up internal maps for each AST which are stored
-        // in `self.ast_items`.
-        let mut ids = IndexMap::new();
-        let mut iface_id_order = Vec::new();
-        let mut world_id_order = Vec::new();
-        for name in order {
-            match names.get(name).unwrap() {
-                ast::AstItem::Interface(_) => {
-                    let id = self.alloc_interface(package_items[name]);
-                    self.interfaces[id].name = Some(name.to_string());
-                    let prev = ids.insert(name, AstItem::Interface(id));
-                    assert!(prev.is_none());
-                    iface_id_order.push(id);
-                }
-                ast::AstItem::World(_) => {
-                    let id = self.alloc_world(package_items[name]);
-                    self.worlds[id].name = name.to_string();
-                    let prev = ids.insert(name, AstItem::World(id));
-                    assert!(prev.is_none());
-                    world_id_order.push(id);
-                }
-                ast::AstItem::Use(_) => unreachable!(),
-            };
-        }
-        for ast in asts {
-            let mut items = IndexMap::new();
-            for item in ast.items.iter() {
-                let (name, ast_item) = match item {
-                    ast::AstItem::Use(u) => {
-                        let name = u.as_.as_ref().unwrap_or(u.item.name());
-                        let item = match &u.item {
-                            ast::UsePath::Id(name) => *ids.get(name.name).ok_or_else(|| Error {
-                                span: name.span,
-                                msg: format!(
-                                    "interface or world `{name}` does not exist",
-                                    name = name.name
-                                ),
-                            })?,
-                            ast::UsePath::Package { id, name } => {
-                                self.foreign_deps[&id.package_name()][name.name]
-                            }
-                        };
-                        (name.name, item)
-                    }
-                    ast::AstItem::Interface(i) => {
-                        let iface_item = ids[i.name.name];
-                        assert!(matches!(iface_item, AstItem::Interface(_)));
-                        (i.name.name, iface_item)
-                    }
-                    ast::AstItem::World(w) => {
-                        let world_item = ids[w.name.name];
-                        assert!(matches!(world_item, AstItem::World(_)));
-                        (w.name.name, world_item)
-                    }
-                };
-                let prev = items.insert(name, ast_item);
-                assert!(prev.is_none());
-
-                // Items defined via `use` don't go into the package namespace,
-                // only the file namespace.
-                if !matches!(item, ast::AstItem::Use(_)) {
-                    let prev = self.package_items.insert(name, ast_item);
-                    assert!(prev.is_none());
-                }
-            }
-            self.ast_items.push(items);
-        }
-        Ok((iface_id_order, world_id_order))
-    }
-
-    /// Generate a `Type::Unknown` entry for all types imported from foreign
-    /// packages.
-    ///
-    /// 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, asts: &[ast::Ast<'a>]) -> Result<()> {
-        for (i, ast) in asts.iter().enumerate() {
-            self.cur_ast_index = i;
-            ast.for_each_path(|_, path, names, _| {
-                let names = match names {
-                    Some(names) => names,
-                    None => return Ok(()),
-                };
-                let (item, name, span) = self.resolve_ast_item_path(path)?;
-                let iface = self.extract_iface_from_item(&item, &name, span)?;
-                if !self.foreign_interfaces.contains(&iface) {
-                    return Ok(());
-                }
-
-                let lookup = &mut self.interface_types[iface.index()];
-                for name in names {
-                    // If this name has already been defined then use that prior
-                    // definition, otherwise create a new type with an unknown
-                    // representation and insert it into the various maps.
-                    if lookup.contains_key(name.name.name) {
-                        continue;
-                    }
-                    let id = self.types.alloc(TypeDef {
-                        docs: Docs::default(),
-                        kind: TypeDefKind::Unknown,
-                        name: Some(name.name.name.to_string()),
-                        owner: TypeOwner::Interface(iface),
-                    });
-                    self.unknown_type_spans.push(name.name.span);
-                    lookup.insert(name.name.name, (TypeOrItem::Type(id), name.name.span));
-                    self.interfaces[iface]
-                        .types
-                        .insert(name.name.name.to_string(), id);
-                }
-
-                Ok(())
-            })?;
-        }
-        Ok(())
-    }
-
-    fn resolve_world(&mut self, world_id: WorldId, world: &ast::World<'a>) -> Result<WorldId> {
-        let docs = self.docs(&world.docs);
-        self.worlds[world_id].docs = docs;
-
-        self.resolve_types(
-            TypeOwner::World(world_id),
-            world.items.iter().filter_map(|i| match i {
-                ast::WorldItem::Use(u) => Some(TypeItem::Use(u)),
-                ast::WorldItem::Type(t) => Some(TypeItem::Def(t)),
-                ast::WorldItem::Import(_) | ast::WorldItem::Export(_) => None,
-                // should be handled in `wit-parser::resolve`
-                ast::WorldItem::Include(_) => None,
-            }),
-        )?;
-
-        // resolve include items
-        let items = world.items.iter().filter_map(|i| match i {
-            ast::WorldItem::Include(i) => Some(i),
-            _ => None,
-        });
-        for include in items {
-            self.resolve_include(world_id, include)?;
-        }
-
-        let mut export_spans = Vec::new();
-        let mut import_spans = Vec::new();
-        let mut import_names = HashMap::new();
-        let mut export_names = HashMap::new();
-        for (name, (item, span)) in self.type_lookup.iter() {
-            match *item {
-                TypeOrItem::Type(id) => {
-                    let prev = import_names.insert(*name, "import");
-                    if let Some(prev) = prev {
-                        return Err(Error {
-                            span: *span,
-                            msg: format!(
-                                "import `{name}` conflicts with prior {prev} of same name",
-                            ),
-                        }
-                        .into());
-                    }
-                    self.worlds[world_id]
-                        .imports
-                        .insert(WorldKey::Name(name.to_string()), WorldItem::Type(id));
-                    import_spans.push(*span);
-                }
-                TypeOrItem::Item(_) => unreachable!(),
-            }
-        }
-
-        let mut imported_interfaces = HashSet::new();
-        let mut exported_interfaces = HashSet::new();
-        for item in world.items.iter() {
-            let (docs, kind, desc, spans, interfaces, names) = match item {
-                ast::WorldItem::Import(import) => (
-                    &import.docs,
-                    &import.kind,
-                    "import",
-                    &mut import_spans,
-                    &mut imported_interfaces,
-                    &mut import_names,
-                ),
-                ast::WorldItem::Export(export) => (
-                    &export.docs,
-                    &export.kind,
-                    "export",
-                    &mut export_spans,
-                    &mut exported_interfaces,
-                    &mut export_names,
-                ),
-
-                ast::WorldItem::Type(ast::TypeDef {
-                    name,
-                    ty: ast::Type::Resource(r),
-                    ..
-                }) => {
-                    for func in r.funcs.iter() {
-                        import_spans.push(func.named_func().name.span);
-                        let func = self.resolve_resource_func(func, name)?;
-                        let prev = self.worlds[world_id]
-                            .imports
-                            .insert(WorldKey::Name(func.name.clone()), WorldItem::Function(func));
-                        // Resource names themselves are unique, and methods are
-                        // uniquely named, so this should be possible to assert
-                        // at this point and never trip.
-                        assert!(prev.is_none());
-                    }
-                    continue;
-                }
-
-                // handled in `resolve_types`
-                ast::WorldItem::Use(_) | ast::WorldItem::Type(_) | ast::WorldItem::Include(_) => {
-                    continue
-                }
-            };
-            let key = match kind {
-                ast::ExternKind::Interface(name, _) | ast::ExternKind::Func(name, _) => {
-                    let prev = names.insert(name.name, desc);
-                    if let Some(prev) = prev {
-                        return Err(Error {
-                            span: kind.span(),
-                            msg: format!(
-                                "{desc} `{name}` conflicts with prior {prev} of same name",
-                                name = name.name
-                            ),
-                        }
-                        .into());
-                    }
-                    WorldKey::Name(name.name.to_string())
-                }
-                ast::ExternKind::Path(path) => {
-                    let (item, name, span) = self.resolve_ast_item_path(path)?;
-                    let id = self.extract_iface_from_item(&item, &name, span)?;
-                    WorldKey::Interface(id)
-                }
-            };
-            let world_item = self.resolve_world_item(docs, kind)?;
-            if let WorldItem::Interface(id) = world_item {
-                if !interfaces.insert(id) {
-                    bail!(Error {
-                        span: kind.span(),
-                        msg: format!("interface cannot be {desc}ed more than once"),
-                    })
-                }
-            }
-            let dst = if desc == "import" {
-                &mut self.worlds[world_id].imports
-            } else {
-                &mut self.worlds[world_id].exports
-            };
-            let prev = dst.insert(key, world_item);
-            assert!(prev.is_none());
-            spans.push(kind.span());
-        }
-        self.world_spans[world_id.index()].imports = import_spans;
-        self.world_spans[world_id.index()].exports = export_spans;
-        self.type_lookup.clear();
-
-        Ok(world_id)
-    }
-
-    fn resolve_world_item(
-        &mut self,
-        docs: &ast::Docs<'a>,
-        kind: &ast::ExternKind<'a>,
-    ) -> Result<WorldItem> {
-        match kind {
-            ast::ExternKind::Interface(name, items) => {
-                let prev = mem::take(&mut self.type_lookup);
-                let id = self.alloc_interface(name.span);
-                self.resolve_interface(id, items, docs)?;
-                self.type_lookup = prev;
-                Ok(WorldItem::Interface(id))
-            }
-            ast::ExternKind::Path(path) => {
-                let (item, name, span) = self.resolve_ast_item_path(path)?;
-                let id = self.extract_iface_from_item(&item, &name, span)?;
-                Ok(WorldItem::Interface(id))
-            }
-            ast::ExternKind::Func(name, func) => {
-                let func =
-                    self.resolve_function(docs, name.name, func, FunctionKind::Freestanding)?;
-                Ok(WorldItem::Function(func))
-            }
-        }
-    }
-
-    fn resolve_interface(
-        &mut self,
-        interface_id: InterfaceId,
-        fields: &[ast::InterfaceItem<'a>],
-        docs: &ast::Docs<'a>,
-    ) -> Result<()> {
-        let docs = self.docs(docs);
-        self.interfaces[interface_id].docs = docs;
-
-        self.resolve_types(
-            TypeOwner::Interface(interface_id),
-            fields.iter().filter_map(|i| match i {
-                ast::InterfaceItem::Use(u) => Some(TypeItem::Use(u)),
-                ast::InterfaceItem::TypeDef(t) => Some(TypeItem::Def(t)),
-                ast::InterfaceItem::Func(_) => None,
-            }),
-        )?;
-
-        for (name, (ty, _)) in self.type_lookup.iter() {
-            match *ty {
-                TypeOrItem::Type(id) => {
-                    self.interfaces[interface_id]
-                        .types
-                        .insert(name.to_string(), id);
-                }
-                TypeOrItem::Item(_) => unreachable!(),
-            }
-        }
-
-        // Finally process all function definitions now that all types are
-        // defined.
-        let mut funcs = Vec::new();
-        for field in fields {
-            match field {
-                ast::InterfaceItem::Func(f) => {
-                    self.define_interface_name(&f.name, TypeOrItem::Item("function"))?;
-                    funcs.push(self.resolve_function(
-                        &f.docs,
-                        &f.name.name,
-                        &f.func,
-                        FunctionKind::Freestanding,
-                    )?);
-                    self.interface_spans[interface_id.index()]
-                        .funcs
-                        .push(f.name.span);
-                }
-                ast::InterfaceItem::Use(_) => {}
-                ast::InterfaceItem::TypeDef(ast::TypeDef {
-                    name,
-                    ty: ast::Type::Resource(r),
-                    ..
-                }) => {
-                    for func in r.funcs.iter() {
-                        funcs.push(self.resolve_resource_func(func, name)?);
-                        self.interface_spans[interface_id.index()]
-                            .funcs
-                            .push(func.named_func().name.span);
-                    }
-                }
-                ast::InterfaceItem::TypeDef(_) => {}
-            }
-        }
-        for func in funcs {
-            let prev = self.interfaces[interface_id]
-                .functions
-                .insert(func.name.clone(), func);
-            assert!(prev.is_none());
-        }
-
-        let lookup = mem::take(&mut self.type_lookup);
-        self.interface_types[interface_id.index()] = lookup;
-
-        Ok(())
-    }
-
-    fn resolve_types<'b>(
-        &mut self,
-        owner: TypeOwner,
-        fields: impl Iterator<Item = TypeItem<'a, 'b>> + Clone,
-    ) -> Result<()>
-    where
-        'a: 'b,
-    {
-        assert!(self.type_lookup.is_empty());
-
-        // First, populate our namespace with `use` statements
-        for field in fields.clone() {
-            match field {
-                TypeItem::Use(u) => {
-                    self.resolve_use(owner, u)?;
-                }
-                TypeItem::Def(_) => {}
-            }
-        }
-
-        // Next determine dependencies between types, perform a topological
-        // sort, and then define all types. This will define types in a
-        // topological fashion, forbid cycles, and weed out references to
-        // undefined types all in one go.
-        let mut type_deps = IndexMap::new();
-        let mut type_defs = IndexMap::new();
-        for field in fields {
-            match field {
-                TypeItem::Def(t) => {
-                    let prev = type_defs.insert(t.name.name, Some(t));
-                    if prev.is_some() {
-                        return Err(Error {
-                            span: t.name.span,
-                            msg: format!("name `{}` is defined more than once", t.name.name),
-                        }
-                        .into());
-                    }
-                    let mut deps = Vec::new();
-                    collect_deps(&t.ty, &mut deps);
-                    type_deps.insert(t.name.name, deps);
-                }
-                TypeItem::Use(u) => {
-                    for name in u.names.iter() {
-                        let name = name.as_.as_ref().unwrap_or(&name.name);
-                        type_deps.insert(name.name, Vec::new());
-                        type_defs.insert(name.name, None);
-                    }
-                }
-            }
-        }
-        let order = toposort("type", &type_deps)?;
-        for ty in order {
-            let def = match type_defs.swap_remove(&ty).unwrap() {
-                Some(def) => def,
-                None => continue,
-            };
-            let docs = self.docs(&def.docs);
-            let kind = self.resolve_type_def(&def.ty)?;
-            let id = self.types.alloc(TypeDef {
-                docs,
-                kind,
-                name: Some(def.name.name.to_string()),
-                owner,
-            });
-            self.define_interface_name(&def.name, TypeOrItem::Type(id))?;
-        }
-        Ok(())
-    }
-
-    fn resolve_use(&mut self, owner: TypeOwner, u: &ast::Use<'a>) -> Result<()> {
-        let (item, name, span) = self.resolve_ast_item_path(&u.from)?;
-        let use_from = self.extract_iface_from_item(&item, &name, span)?;
-
-        for name in u.names.iter() {
-            let lookup = &self.interface_types[use_from.index()];
-            let id = match lookup.get(name.name.name) {
-                Some((TypeOrItem::Type(id), _)) => *id,
-                Some((TypeOrItem::Item(s), _)) => {
-                    bail!(Error {
-                        span: name.name.span,
-                        msg: format!("cannot import {s} `{}`", name.name.name),
-                    })
-                }
-                None => bail!(Error {
-                    span: name.name.span,
-                    msg: format!("name `{}` is not defined", name.name.name),
-                }),
-            };
-            let name = name.as_.as_ref().unwrap_or(&name.name);
-            let id = self.types.alloc(TypeDef {
-                docs: Docs::default(),
-                kind: TypeDefKind::Type(Type::Id(id)),
-                name: Some(name.name.to_string()),
-                owner,
-            });
-            self.define_interface_name(name, TypeOrItem::Type(id))?;
-        }
-        Ok(())
-    }
-
-    /// For each name in the `include`, resolve the path of the include, add it to the self.includes
-    fn resolve_include(&mut self, world_id: WorldId, i: &ast::Include<'a>) -> Result<()> {
-        let (item, name, span) = self.resolve_ast_item_path(&i.from)?;
-        let include_from = self.extract_world_from_item(&item, &name, span)?;
-        self.worlds[world_id].includes.push(include_from);
-        self.worlds[world_id].include_names.push(
-            i.names
-                .iter()
-                .map(|n| IncludeName {
-                    name: n.name.name.to_string(),
-                    as_: n.as_.name.to_string(),
-                })
-                .collect(),
-        );
-        self.world_spans[world_id.index()].includes.push(span);
-        Ok(())
-    }
-
-    fn resolve_resource_func(
-        &mut self,
-        func: &ast::ResourceFunc<'_>,
-        resource: &ast::Id<'_>,
-    ) -> Result<Function> {
-        let resource_id = match self.type_lookup.get(resource.name) {
-            Some((TypeOrItem::Type(id), _)) => *id,
-            _ => panic!("type lookup for resource failed"),
-        };
-        let (name, kind);
-        match func {
-            ast::ResourceFunc::Method(f) => {
-                name = format!("[method]{}.{}", resource.name, f.name.name);
-                kind = FunctionKind::Method(resource_id);
-            }
-            ast::ResourceFunc::Static(f) => {
-                name = format!("[static]{}.{}", resource.name, f.name.name);
-                kind = FunctionKind::Static(resource_id);
-            }
-            ast::ResourceFunc::Constructor(_) => {
-                name = format!("[constructor]{}", resource.name);
-                kind = FunctionKind::Constructor(resource_id);
-            }
-        }
-        let named_func = func.named_func();
-        self.resolve_function(&named_func.docs, &name, &named_func.func, kind)
-    }
-
-    fn resolve_function(
-        &mut self,
-        docs: &ast::Docs<'_>,
-        name: &str,
-        func: &ast::Func,
-        kind: FunctionKind,
-    ) -> Result<Function> {
-        let docs = self.docs(docs);
-        let params = self.resolve_params(&func.params, &kind)?;
-        let results = self.resolve_results(&func.results, &kind)?;
-        Ok(Function {
-            docs,
-            name: name.to_string(),
-            kind,
-            params,
-            results,
-        })
-    }
-
-    fn resolve_ast_item_path(&self, path: &ast::UsePath<'a>) -> Result<(AstItem, String, Span)> {
-        match path {
-            ast::UsePath::Id(id) => {
-                let item = self.ast_items[self.cur_ast_index]
-                    .get(id.name)
-                    .or_else(|| self.package_items.get(id.name));
-                match item {
-                    Some(item) => Ok((*item, id.name.into(), id.span)),
-                    None => {
-                        bail!(Error {
-                            span: id.span,
-                            msg: format!("interface or world `{}` does not exist", id.name),
-                        })
-                    }
-                }
-            }
-            ast::UsePath::Package { id, name } => Ok((
-                self.foreign_deps[&id.package_name()][name.name],
-                name.name.into(),
-                name.span,
-            )),
-        }
-    }
-
-    fn extract_iface_from_item(
-        &self,
-        item: &AstItem,
-        name: &str,
-        span: Span,
-    ) -> Result<InterfaceId> {
-        match item {
-            AstItem::Interface(id) => Ok(*id),
-            AstItem::World(_) => {
-                bail!(Error {
-                    span: span,
-                    msg: format!("name `{}` is defined as a world, not an interface", name),
-                })
-            }
-        }
-    }
-
-    fn extract_world_from_item(&self, item: &AstItem, name: &str, span: Span) -> Result<WorldId> {
-        match item {
-            AstItem::World(id) => Ok(*id),
-            AstItem::Interface(_) => {
-                bail!(Error {
-                    span: span,
-                    msg: format!("name `{}` is defined as an interface, not a world", name),
-                })
-            }
-        }
-    }
-
-    fn define_interface_name(&mut self, name: &ast::Id<'a>, item: TypeOrItem) -> Result<()> {
-        let prev = self.type_lookup.insert(name.name, (item, name.span));
-        if prev.is_some() {
-            Err(Error {
-                span: name.span,
-                msg: format!("name `{}` is defined more than once", name.name),
-            }
-            .into())
-        } else {
-            Ok(())
-        }
-    }
-
-    fn resolve_type_def(&mut self, ty: &ast::Type<'_>) -> Result<TypeDefKind> {
-        Ok(match ty {
-            ast::Type::Bool => TypeDefKind::Type(Type::Bool),
-            ast::Type::U8 => TypeDefKind::Type(Type::U8),
-            ast::Type::U16 => TypeDefKind::Type(Type::U16),
-            ast::Type::U32 => TypeDefKind::Type(Type::U32),
-            ast::Type::U64 => TypeDefKind::Type(Type::U64),
-            ast::Type::S8 => TypeDefKind::Type(Type::S8),
-            ast::Type::S16 => TypeDefKind::Type(Type::S16),
-            ast::Type::S32 => TypeDefKind::Type(Type::S32),
-            ast::Type::S64 => TypeDefKind::Type(Type::S64),
-            ast::Type::F32 => TypeDefKind::Type(Type::F32),
-            ast::Type::F64 => TypeDefKind::Type(Type::F64),
-            ast::Type::Char => TypeDefKind::Type(Type::Char),
-            ast::Type::String => TypeDefKind::Type(Type::String),
-            ast::Type::Name(name) => {
-                let id = self.resolve_type_name(name)?;
-                TypeDefKind::Type(Type::Id(id))
-            }
-            ast::Type::List(list) => {
-                let ty = self.resolve_type(list)?;
-                TypeDefKind::List(ty)
-            }
-            ast::Type::Handle(handle) => TypeDefKind::Handle(match handle {
-                ast::Handle::Own { resource } => Handle::Own(self.validate_resource(resource)?),
-                ast::Handle::Borrow { resource } => {
-                    Handle::Borrow(self.validate_resource(resource)?)
-                }
-            }),
-            ast::Type::Resource(resource) => {
-                // Validate here that the resource doesn't have any duplicate-ly
-                // named methods and that there's at most one constructor.
-                let mut ctors = 0;
-                let mut names = HashSet::new();
-                for func in resource.funcs.iter() {
-                    match func {
-                        ast::ResourceFunc::Method(f) | ast::ResourceFunc::Static(f) => {
-                            if !names.insert(&f.name.name) {
-                                bail!(Error {
-                                    span: f.name.span,
-                                    msg: format!("duplicate function name `{}`", f.name.name),
-                                })
-                            }
-                        }
-                        ast::ResourceFunc::Constructor(f) => {
-                            ctors += 1;
-                            if ctors > 1 {
-                                bail!(Error {
-                                    span: f.name.span,
-                                    msg: format!("duplicate constructors"),
-                                })
-                            }
-                        }
-                    }
-                }
-
-                TypeDefKind::Resource
-            }
-            ast::Type::Record(record) => {
-                let fields = record
-                    .fields
-                    .iter()
-                    .map(|field| {
-                        Ok(Field {
-                            docs: self.docs(&field.docs),
-                            name: field.name.name.to_string(),
-                            ty: self.resolve_type(&field.ty)?,
-                        })
-                    })
-                    .collect::<Result<Vec<_>>>()?;
-                TypeDefKind::Record(Record { fields })
-            }
-            ast::Type::Flags(flags) => {
-                let flags = flags
-                    .flags
-                    .iter()
-                    .map(|flag| Flag {
-                        docs: self.docs(&flag.docs),
-                        name: flag.name.name.to_string(),
-                    })
-                    .collect::<Vec<_>>();
-                TypeDefKind::Flags(Flags { flags })
-            }
-            ast::Type::Tuple(types) => {
-                let types = types
-                    .iter()
-                    .map(|ty| self.resolve_type(ty))
-                    .collect::<Result<Vec<_>>>()?;
-                TypeDefKind::Tuple(Tuple { types })
-            }
-            ast::Type::Variant(variant) => {
-                if variant.cases.is_empty() {
-                    return Err(Error {
-                        span: variant.span,
-                        msg: "empty variant".to_string(),
-                    }
-                    .into());
-                }
-                let cases = variant
-                    .cases
-                    .iter()
-                    .map(|case| {
-                        Ok(Case {
-                            docs: self.docs(&case.docs),
-                            name: case.name.name.to_string(),
-                            ty: self.resolve_optional_type(case.ty.as_ref())?,
-                        })
-                    })
-                    .collect::<Result<Vec<_>>>()?;
-                TypeDefKind::Variant(Variant { cases })
-            }
-            ast::Type::Enum(e) => {
-                if e.cases.is_empty() {
-                    return Err(Error {
-                        span: e.span,
-                        msg: "empty enum".to_string(),
-                    }
-                    .into());
-                }
-                let cases = e
-                    .cases
-                    .iter()
-                    .map(|case| {
-                        Ok(EnumCase {
-                            docs: self.docs(&case.docs),
-                            name: case.name.name.to_string(),
-                        })
-                    })
-                    .collect::<Result<Vec<_>>>()?;
-                TypeDefKind::Enum(Enum { cases })
-            }
-            ast::Type::Option(ty) => TypeDefKind::Option(self.resolve_type(ty)?),
-            ast::Type::Result(r) => TypeDefKind::Result(Result_ {
-                ok: self.resolve_optional_type(r.ok.as_deref())?,
-                err: self.resolve_optional_type(r.err.as_deref())?,
-            }),
-            ast::Type::Future(t) => TypeDefKind::Future(self.resolve_optional_type(t.as_deref())?),
-            ast::Type::Stream(s) => TypeDefKind::Stream(Stream {
-                element: self.resolve_optional_type(s.element.as_deref())?,
-                end: self.resolve_optional_type(s.end.as_deref())?,
-            }),
-        })
-    }
-
-    fn resolve_type_name(&mut self, name: &ast::Id<'_>) -> Result<TypeId> {
-        match self.type_lookup.get(name.name) {
-            Some((TypeOrItem::Type(id), _)) => Ok(*id),
-            Some((TypeOrItem::Item(s), _)) => bail!(Error {
-                span: name.span,
-                msg: format!("cannot use {s} `{name}` as a type", name = name.name),
-            }),
-            None => bail!(Error {
-                span: name.span,
-                msg: format!("name `{name}` is not defined", name = name.name),
-            }),
-        }
-    }
-
-    fn validate_resource(&mut self, name: &ast::Id<'_>) -> Result<TypeId> {
-        let id = self.resolve_type_name(name)?;
-        let mut cur = id;
-        loop {
-            match self.types[cur].kind {
-                TypeDefKind::Resource => break Ok(id),
-                TypeDefKind::Type(Type::Id(ty)) => cur = ty,
-                TypeDefKind::Unknown => {
-                    self.required_resource_types.push((cur, name.span));
-                    break Ok(id);
-                }
-                _ => bail!(Error {
-                    span: name.span,
-                    msg: format!("type `{}` used in a handle must be a resource", name.name),
-                }),
-            }
-        }
-    }
-
-    fn resolve_type(&mut self, ty: &super::Type<'_>) -> Result<Type> {
-        // Resources must be declared at the top level to have their methods
-        // processed appropriately, but resources also shouldn't show up
-        // recursively so assert that's not happening here.
-        match ty {
-            ast::Type::Resource(_) => unreachable!(),
-            _ => {}
-        }
-        let kind = self.resolve_type_def(ty)?;
-        Ok(self.anon_type_def(TypeDef {
-            kind,
-            name: None,
-            docs: Docs::default(),
-            owner: TypeOwner::None,
-        }))
-    }
-
-    fn resolve_optional_type(&mut self, ty: Option<&super::Type<'_>>) -> Result<Option<Type>> {
-        match ty {
-            Some(ty) => Ok(Some(self.resolve_type(ty)?)),
-            None => Ok(None),
-        }
-    }
-
-    fn anon_type_def(&mut self, ty: TypeDef) -> Type {
-        let key = match &ty.kind {
-            TypeDefKind::Type(t) => return *t,
-            TypeDefKind::Variant(v) => Key::Variant(
-                v.cases
-                    .iter()
-                    .map(|case| (case.name.clone(), case.ty))
-                    .collect::<Vec<_>>(),
-            ),
-            TypeDefKind::Handle(Handle::Borrow(h)) => Key::BorrowHandle(*h),
-            // An anonymous `own<T>` type is the same as a reference to the type
-            // `T`, so avoid creating anonymous type and return that here
-            // directly. Note that this additionally avoids creating distinct
-            // anonymous types for `list<T>` and `list<own<T>>` for example.
-            TypeDefKind::Handle(Handle::Own(id)) => return Type::Id(*id),
-            TypeDefKind::Resource => unreachable!("anonymous resources aren't supported"),
-            TypeDefKind::Record(r) => Key::Record(
-                r.fields
-                    .iter()
-                    .map(|case| (case.name.clone(), case.ty))
-                    .collect::<Vec<_>>(),
-            ),
-            TypeDefKind::Flags(r) => {
-                Key::Flags(r.flags.iter().map(|f| f.name.clone()).collect::<Vec<_>>())
-            }
-            TypeDefKind::Tuple(t) => Key::Tuple(t.types.clone()),
-            TypeDefKind::Enum(r) => {
-                Key::Enum(r.cases.iter().map(|f| f.name.clone()).collect::<Vec<_>>())
-            }
-            TypeDefKind::List(ty) => Key::List(*ty),
-            TypeDefKind::Option(t) => Key::Option(*t),
-            TypeDefKind::Result(r) => Key::Result(r.ok, r.err),
-            TypeDefKind::Future(ty) => Key::Future(*ty),
-            TypeDefKind::Stream(s) => Key::Stream(s.element, s.end),
-            TypeDefKind::Unknown => unreachable!(),
-        };
-        let types = &mut self.types;
-        let id = self
-            .anon_types
-            .entry(key)
-            .or_insert_with(|| types.alloc(ty));
-        Type::Id(*id)
-    }
-
-    fn docs(&mut self, doc: &super::Docs<'_>) -> Docs {
-        let mut docs = vec![];
-        for doc in doc.docs.iter() {
-            if let Some(doc) = doc.strip_prefix("/**") {
-                docs.push(doc.strip_suffix("*/").unwrap().trim());
-            } else {
-                docs.push(doc.trim_start_matches('/').trim());
-            }
-        }
-        let contents = if docs.is_empty() {
-            None
-        } else {
-            // NB: this notably, through the use of `lines`, normalizes `\r\n`
-            // to `\n`.
-            let mut contents = String::new();
-            for doc in docs {
-                if doc.is_empty() {
-                    contents.push_str("\n");
-                } else {
-                    for line in doc.lines() {
-                        contents.push_str(line);
-                        contents.push_str("\n");
-                    }
-                }
-            }
-            while contents.ends_with("\n") {
-                contents.pop();
-            }
-            Some(contents)
-        };
-        Docs { contents }
-    }
-
-    fn resolve_params(&mut self, params: &ParamList<'_>, kind: &FunctionKind) -> Result<Params> {
-        let mut ret = IndexMap::new();
-        match *kind {
-            // These kinds of methods don't have any adjustments to the
-            // parameters, so do nothing here.
-            FunctionKind::Freestanding | FunctionKind::Constructor(_) | FunctionKind::Static(_) => {
-            }
-
-            // Methods automatically get a `self` initial argument so insert
-            // that here before processing the normal parameters.
-            FunctionKind::Method(id) => {
-                let shared = self.anon_type_def(TypeDef {
-                    docs: Docs::default(),
-                    kind: TypeDefKind::Handle(Handle::Borrow(id)),
-                    name: None,
-                    owner: TypeOwner::None,
-                });
-                ret.insert("self".to_string(), shared);
-            }
-        }
-        for (name, ty) in params {
-            let prev = ret.insert(name.name.to_string(), self.resolve_type(ty)?);
-            if prev.is_some() {
-                return Err(Error {
-                    span: name.span,
-                    msg: format!("param `{}` is defined more than once", name.name),
-                }
-                .into());
-            }
-        }
-        Ok(ret.into_iter().collect())
-    }
-
-    fn resolve_results(
-        &mut self,
-        results: &ResultList<'_>,
-        kind: &FunctionKind,
-    ) -> Result<Results> {
-        match *kind {
-            // These kinds of methods don't have any adjustments to the return
-            // values, so plumb them through as-is.
-            FunctionKind::Freestanding | FunctionKind::Method(_) | FunctionKind::Static(_) => {
-                match results {
-                    ResultList::Named(rs) => Ok(Results::Named(
-                        self.resolve_params(rs, &FunctionKind::Freestanding)?,
-                    )),
-                    ResultList::Anon(ty) => Ok(Results::Anon(self.resolve_type(ty)?)),
-                }
-            }
-
-            // Constructors are alwys parsed as 0 returned types but they're
-            // automatically translated as a single return type of the type that
-            // it's a constructor for.
-            FunctionKind::Constructor(id) => {
-                match results {
-                    ResultList::Named(rs) => assert!(rs.is_empty()),
-                    ResultList::Anon(_) => unreachable!(),
-                }
-                Ok(Results::Anon(Type::Id(id)))
-            }
-        }
-    }
-}
-
-fn collect_deps<'a>(ty: &ast::Type<'a>, deps: &mut Vec<ast::Id<'a>>) {
-    match ty {
-        ast::Type::Bool
-        | ast::Type::U8
-        | ast::Type::U16
-        | ast::Type::U32
-        | ast::Type::U64
-        | ast::Type::S8
-        | ast::Type::S16
-        | ast::Type::S32
-        | ast::Type::S64
-        | ast::Type::F32
-        | ast::Type::F64
-        | ast::Type::Char
-        | ast::Type::String
-        | ast::Type::Flags(_)
-        | ast::Type::Enum(_) => {}
-        ast::Type::Name(name) => deps.push(name.clone()),
-        ast::Type::List(list) => collect_deps(list, deps),
-        ast::Type::Handle(handle) => match handle {
-            ast::Handle::Own { resource } => deps.push(resource.clone()),
-            ast::Handle::Borrow { resource } => deps.push(resource.clone()),
-        },
-        ast::Type::Resource(_) => {}
-        ast::Type::Record(record) => {
-            for field in record.fields.iter() {
-                collect_deps(&field.ty, deps);
-            }
-        }
-        ast::Type::Tuple(types) => {
-            for ty in types {
-                collect_deps(ty, deps);
-            }
-        }
-        ast::Type::Variant(variant) => {
-            for case in variant.cases.iter() {
-                if let Some(ty) = &case.ty {
-                    collect_deps(ty, deps);
-                }
-            }
-        }
-        ast::Type::Option(ty) => collect_deps(ty, deps),
-        ast::Type::Result(r) => {
-            if let Some(ty) = &r.ok {
-                collect_deps(ty, deps);
-            }
-            if let Some(ty) = &r.err {
-                collect_deps(ty, deps);
-            }
-        }
-        ast::Type::Future(t) => {
-            if let Some(t) = t {
-                collect_deps(t, deps)
-            }
-        }
-        ast::Type::Stream(s) => {
-            if let Some(t) = &s.element {
-                collect_deps(t, deps);
-            }
-            if let Some(t) = &s.end {
-                collect_deps(t, deps);
-            }
-        }
-    }
-}