diff --git a/crates/backend/src/ast.rs b/crates/backend/src/ast.rs index 041066af..34492ecd 100644 --- a/crates/backend/src/ast.rs +++ b/crates/backend/src/ast.rs @@ -217,7 +217,7 @@ impl Function { impl Export { pub(crate) fn rust_symbol(&self) -> Ident { - let mut generated_name = format!("__wasm_bindgen_generated"); + let mut generated_name = String::from("__wasm_bindgen_generated"); if let Some(class) = &self.class { generated_name.push_str("_"); generated_name.push_str(&class.to_string()); diff --git a/crates/backend/src/codegen.rs b/crates/backend/src/codegen.rs index d8034a10..c9dc2f4d 100644 --- a/crates/backend/src/codegen.rs +++ b/crates/backend/src/codegen.rs @@ -314,11 +314,12 @@ impl ToTokens for ast::Export { let mut converted_arguments = vec![]; let ret = Ident::new("_ret", Span::call_site()); - let mut offset = 0; - if self.method_self.is_some() { + let offset = if self.method_self.is_some() { args.push(quote! { me: u32 }); - offset = 1; - } + 1 + } else { + 0 + }; let name = &self.function.name; let receiver = match self.method_self { diff --git a/crates/webidl/src/first_pass.rs b/crates/webidl/src/first_pass.rs index e48cf628..a4b063c8 100644 --- a/crates/webidl/src/first_pass.rs +++ b/crates/webidl/src/first_pass.rs @@ -125,7 +125,7 @@ impl FirstPass for webidl::ast::NonPartialMixin { let entry = record .mixins .entry(self.name.clone()) - .or_insert(Default::default()); + .or_insert_with(Default::default); if mem::replace(&mut entry.non_partial, Some(self)).is_some() { warn!( "Encounterd multiple declarations of {}, using last encountered", @@ -142,7 +142,7 @@ impl FirstPass for webidl::ast::PartialMixin { let entry = record .mixins .entry(self.name.clone()) - .or_insert(Default::default()); + .or_insert_with(Default::default); entry.partials.push(self); Ok(()) diff --git a/crates/webidl/src/util.rs b/crates/webidl/src/util.rs index 517716a4..58c1d8da 100644 --- a/crates/webidl/src/util.rs +++ b/crates/webidl/src/util.rs @@ -247,7 +247,7 @@ impl<'a> FirstPassRecord<'a> { let js_ret = ret.clone(); if catch { - ret = Some(ret.map_or_else(|| result_ty(unit_ty()), |ret| result_ty(ret))) + ret = Some(ret.map_or_else(|| result_ty(unit_ty()), result_ty)) } let shim = {