Nits

Author: jedisct1

Cargo.toml

@@ -12,11 +12,11 @@ keywords = ["witx", "webassembly", "wasm", "generator", "bindgen"]
 readme = "README.md"
 
 [dependencies]
-anyhow = "1.0.82"
-convert_case = "0.6.0"
+anyhow = "1.0.100"
+convert_case = "0.10.0"
 structopt = "0.3.26"
-strum = "0.26.2"
-strum_macros = "0.26.2"
+strum = "0.27.2"
+strum_macros = "0.27.2"
 witx = { package = "witnext", version = "0.10.0-beta3" }
 
 [package.metadata.deb]

src/assemblyscript/common.rs

@@ -111,7 +111,7 @@ impl ToLanguageRepresentation for ASType {
 }
 
 pub fn escape_reserved_word(word: &str) -> String {
-    if RESERVED.iter().any(|k| *k == word) {
+    if RESERVED.contains(&word) {
         // If the camel-cased string matched any strict or reserved keywords, then
         // append a trailing underscore to the identifier we generate.
         format!("{}_", word)

src/cpp/common.rs

@@ -2,26 +2,6 @@ use super::tuple::Tuple;
 use crate::astype::*;
 use convert_case::{Case, Casing};
 
-pub trait IsNullable {
-    fn is_nullable(&self) -> bool;
-}
-
-impl IsNullable for ASType {
-    fn is_nullable(&self) -> bool {
-        matches!(
-            self,
-            ASType::ConstPtr(_)
-                | ASType::MutPtr(_)
-                | ASType::ReadBuffer(_)
-                | ASType::WriteBuffer(_)
-                | ASType::Enum(_)
-                | ASType::Struct(_)
-                | ASType::Tuple(_)
-                | ASType::Union(_)
-        )
-    }
-}
-
 pub trait Normalize {
     fn as_str(&self) -> &str;
 
@@ -33,21 +13,13 @@ pub trait Normalize {
         self.as_str().to_case(Case::Snake)
     }
 
-    fn as_fn_suffix(&self) -> String {
-        self.as_str().to_case(Case::Snake)
-    }
-
     fn as_var(&self) -> String {
         self.as_str().to_case(Case::Snake)
     }
 
     fn as_const(&self) -> String {
         self.as_str().to_case(Case::UpperSnake)
     }
-
-    fn as_namespace(&self) -> String {
-        self.as_str().to_case(Case::Pascal)
-    }
 }
 
 impl<T: AsRef<str>> Normalize for T {

src/doc/common.rs

@@ -17,21 +17,13 @@ pub trait Normalize {
         format!("[`{}()`]({})", self.as_str(), self.as_link())
     }
 
-    fn as_fn_suffix(&self) -> String {
-        self.as_str().to_string()
-    }
-
     fn as_var(&self) -> String {
         format!("**`{}`**", self.as_str())
     }
 
     fn as_const(&self) -> String {
         format!("**`{}`**", self.as_str())
     }
-
-    fn as_namespace(&self) -> String {
-        format!("**[`{}`]({})**", self.as_str(), self.as_link())
-    }
 }
 
 impl<T: AsRef<str>> Normalize for T {

src/doc/function.rs

@@ -69,7 +69,7 @@ impl DocGenerator {
                         let mut w = w.new_block();
                         for result in &results {
                             let result_as_ptr = ASType::MutPtr(result.1.clone());
-                            w.write_line(&result_as_ptr.as_lang())?;
+                            w.write_line(result_as_ptr.as_lang())?;
                         }
                     }
                 }

src/overview/common.rs

@@ -11,21 +11,13 @@ pub trait Normalize {
         self.as_str().to_string()
     }
 
-    fn as_fn_suffix(&self) -> String {
-        self.as_str().to_string()
-    }
-
     fn as_var(&self) -> String {
         self.as_str().to_string()
     }
 
     fn as_const(&self) -> String {
         self.as_str().to_string()
     }
-
-    fn as_namespace(&self) -> String {
-        self.as_str().to_string()
-    }
 }
 
 impl<T: AsRef<str>> Normalize for T {

src/pretty_writer.rs

@@ -127,7 +127,7 @@ impl<W: Write> PrettyWriter<W> {
     /// Write multiple indented lines
     pub fn write_lines<T: AsRef<[u8]>>(&mut self, buf: T) -> Result<&mut Self, Error> {
         let buf = buf.as_ref();
-        for line in buf.lines().flatten() {
+        for line in buf.lines().map_while(Result::ok) {
             self.write_line(line)?;
         }
         Ok(self)

src/rust/common.rs

@@ -3,26 +3,6 @@ use convert_case::{Case, Casing};
 use super::tuple::Tuple;
 use crate::astype::*;
 
-pub trait IsNullable {
-    fn is_nullable(&self) -> bool;
-}
-
-impl IsNullable for ASType {
-    fn is_nullable(&self) -> bool {
-        matches!(
-            self,
-            ASType::ConstPtr(_)
-                | ASType::MutPtr(_)
-                | ASType::ReadBuffer(_)
-                | ASType::WriteBuffer(_)
-                | ASType::Enum(_)
-                | ASType::Struct(_)
-                | ASType::Tuple(_)
-                | ASType::Union(_)
-        )
-    }
-}
-
 pub trait Normalize {
     fn as_str(&self) -> &str;
 

src/zig/common.rs

@@ -3,37 +3,13 @@ use convert_case::{Case, Casing};
 use super::tuple::Tuple;
 use crate::astype::*;
 
-pub trait IsNullable {
-    fn is_nullable(&self) -> bool;
-}
-
-impl IsNullable for ASType {
-    fn is_nullable(&self) -> bool {
-        matches!(
-            self,
-            ASType::ConstPtr(_)
-                | ASType::MutPtr(_)
-                | ASType::ReadBuffer(_)
-                | ASType::WriteBuffer(_)
-                | ASType::Enum(_)
-                | ASType::Struct(_)
-                | ASType::Tuple(_)
-                | ASType::Union(_)
-        )
-    }
-}
-
 pub trait Normalize {
     fn as_str(&self) -> &str;
 
     fn as_type(&self) -> String {
         self.as_str().to_case(Case::Pascal)
     }
 
-    fn as_fn(&self) -> String {
-        self.as_str().to_case(Case::Camel)
-    }
-
     fn as_fn_suffix(&self) -> String {
         self.as_str().to_case(Case::UpperCamel)
     }
@@ -112,7 +88,7 @@ impl ToLanguageRepresentation for ASType {
 /// If the given word conflicts with a keyword, a trailing underscore will be
 /// appended.
 pub fn escape_reserved_word(word: &str) -> String {
-    if RESERVED.iter().any(|k| *k == word) {
+    if RESERVED.contains(&word) {
         // If the camel-cased string matched any strict or reserved keywords, then
         // append a trailing underscore to the identifier we generate.
         format!("{}_", word)

src/zig/union.rs

@@ -135,7 +135,7 @@ impl ZigGenerator {
             w.write_line("member = extern union {")?;
             {
                 let mut w = w.new_block();
-                for (_i, member) in union_.members.iter().enumerate() {
+                for member in &union_.members {
                     let member_is_void = matches!(member.type_.as_ref(), ASType::Void);
                     if !member_is_void {
                         w.write_line(format!(