diff --git a/crates/wac-graph/src/encoding.rs b/crates/wac-graph/src/encoding.rs index 7eb09e5..a120b3e 100644 --- a/crates/wac-graph/src/encoding.rs +++ b/crates/wac-graph/src/encoding.rs @@ -17,6 +17,7 @@ use wasm_encoder::{ /// A type used to abstract the API differences between a component builder, /// component type, and instance type from `wasm-encoder`. #[derive(Debug)] +#[allow(clippy::large_enum_variant)] enum Encodable { Builder(ComponentBuilder), Instance(InstanceType), @@ -48,7 +49,7 @@ impl Encodable { } } - fn ty(&mut self) -> ComponentTypeEncoder { + fn ty(&mut self) -> ComponentTypeEncoder<'_> { match self { Encodable::Builder(t) => t.ty(None).1, Encodable::Instance(t) => t.ty(), @@ -56,7 +57,7 @@ impl Encodable { } } - fn core_type(&mut self) -> ComponentCoreTypeEncoder { + fn core_type(&mut self) -> ComponentCoreTypeEncoder<'_> { match self { Encodable::Builder(t) => t.core_type(None).1, Encodable::Instance(t) => t.core_type(), diff --git a/crates/wac-parser/src/ast.rs b/crates/wac-parser/src/ast.rs index 0353832..1698c3b 100644 --- a/crates/wac-parser/src/ast.rs +++ b/crates/wac-parser/src/ast.rs @@ -359,7 +359,7 @@ impl<'a> Document<'a> { pub fn resolve( &self, packages: IndexMap, Vec>, - ) -> ResolutionResult { + ) -> ResolutionResult> { AstResolver::new(self).resolve(packages) } } diff --git a/crates/wac-parser/src/ast/type.rs b/crates/wac-parser/src/ast/type.rs index 9d1984b..02b7174 100644 --- a/crates/wac-parser/src/ast/type.rs +++ b/crates/wac-parser/src/ast/type.rs @@ -62,7 +62,7 @@ pub enum TypeDecl<'a> { impl TypeDecl<'_> { /// Gets the identifier of the type being declared. - pub fn id(&self) -> &Ident { + pub fn id(&self) -> &Ident<'_> { match self { Self::Variant(variant) => &variant.id, Self::Record(record) => &record.id, @@ -787,7 +787,7 @@ impl<'a> Parse<'a> for Type<'a> { } else if Type::peek(&mut lookahead) { Ok(Some(Box::new(Parse::parse(lexer)?))) } else { - return Err(lookahead.error()); + Err(lookahead.error()) } })? .unwrap_or(None); @@ -904,7 +904,7 @@ impl Peek for ItemTypeDecl<'_> { impl ItemTypeDecl<'_> { /// Gets the identifier of the type being declared. - pub fn id(&self) -> &Ident { + pub fn id(&self) -> &Ident<'_> { match self { Self::Resource(resource) => &resource.id, Self::Variant(variant) => &variant.id, diff --git a/crates/wac-parser/src/resolution.rs b/crates/wac-parser/src/resolution.rs index ee18564..984d241 100644 --- a/crates/wac-parser/src/resolution.rs +++ b/crates/wac-parser/src/resolution.rs @@ -666,7 +666,7 @@ pub struct Resolution<'a> { impl Resolution<'_> { /// Gets the document that was resolved. - pub fn document(&self) -> &Document { + pub fn document(&self) -> &Document<'_> { self.document } diff --git a/crates/wac-types/src/package.rs b/crates/wac-types/src/package.rs index 6d3daab..da062e3 100644 --- a/crates/wac-types/src/package.rs +++ b/crates/wac-types/src/package.rs @@ -101,11 +101,11 @@ impl fmt::Display for BorrowedPackageKey<'_> { /// A trait implemented by types that can be borrowed as a package key. pub trait BorrowedKey { /// Borrows the key as a borrowed package key. - fn borrowed_key(&self) -> BorrowedPackageKey; + fn borrowed_key(&self) -> BorrowedPackageKey<'_>; } impl BorrowedKey for PackageKey { - fn borrowed_key(&self) -> BorrowedPackageKey { + fn borrowed_key(&self) -> BorrowedPackageKey<'_> { BorrowedPackageKey { name: &self.name, version: self.version.as_ref(), @@ -114,7 +114,7 @@ impl BorrowedKey for PackageKey { } impl BorrowedKey for BorrowedPackageKey<'_> { - fn borrowed_key(&self) -> BorrowedPackageKey { + fn borrowed_key(&self) -> BorrowedPackageKey<'_> { *self } } @@ -125,15 +125,15 @@ impl<'a> Borrow for PackageKey { } } -impl Eq for (dyn BorrowedKey + '_) {} +impl Eq for dyn BorrowedKey + '_ {} -impl PartialEq for (dyn BorrowedKey + '_) { +impl PartialEq for dyn BorrowedKey + '_ { fn eq(&self, other: &dyn BorrowedKey) -> bool { self.borrowed_key().eq(&other.borrowed_key()) } } -impl std::hash::Hash for (dyn BorrowedKey + '_) { +impl std::hash::Hash for dyn BorrowedKey + '_ { fn hash(&self, state: &mut H) { self.borrowed_key().hash(state) } @@ -165,7 +165,7 @@ pub struct Package { impl Package { /// Gets the package key for the package. - pub fn key(&self) -> BorrowedPackageKey { + pub fn key(&self) -> BorrowedPackageKey<'_> { BorrowedPackageKey::new(self) }