Fix clippy and tests (#347)

rust-diplomat · Oct 19, 2023 · 5091e17 · 5091e17
1 parent 2a52612
commit 5091e17
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 36 deletions.
diff --git a/core/src/ast/methods.rs b/core/src/ast/methods.rs
@@ -331,9 +331,10 @@ impl BorrowedParams<'_> {
     /// param will be called if present.
     pub fn return_names<'a>(&'a self, self_name: &'a Ident) -> impl Iterator<Item = &'a Ident> {
         self.0.iter().map(move |_| self_name).chain(
-            self.1.iter().filter_map(|&(param, ltk)| {
-                (ltk == LifetimeKind::ReturnValue).then(|| &param.name)
-            }),
+            self.1
+                .iter()
+                .filter(|(_, ltk)| (*ltk == LifetimeKind::ReturnValue))
+                .map(|(param, _)| &param.name),
         )
     }
 
@@ -342,7 +343,8 @@ impl BorrowedParams<'_> {
     pub fn static_names(&self) -> impl Iterator<Item = &'_ Ident> {
         self.1
             .iter()
-            .filter_map(|&(param, ltk)| (ltk == LifetimeKind::Static).then(|| &param.name))
+            .filter(|(_, ltk)| (*ltk == LifetimeKind::Static))
+            .map(|(param, _)| &param.name)
     }
 
     /// Returns `true` if a provided param name is included in the borrowed params,

diff --git a/example/js/lib/test/fixed-decimal-ts.mjs b/example/js/lib/test/fixed-decimal-ts.mjs
@@ -1,5 +1,5 @@
 import test from 'ava';
-import { ICU4XFixedDecimal, ICU4XLocale, ICU4XDataProvider, ICU4XFixedDecimalFormat, ICU4XFixedDecimalFormatOptions } from "../api/index.js";
+import { ICU4XFixedDecimal, ICU4XLocale, ICU4XDataProvider, ICU4XFixedDecimalFormatter, ICU4XFixedDecimalFormatterOptions } from "../api/index.js";
 test("multiply a fixed decimal by 1.1", t => {
     const my_decimal = ICU4XFixedDecimal.new(123);
     my_decimal.multiply_pow10(-1);
@@ -12,7 +12,7 @@ test("format a fixed decimal", t => {
     let locale = ICU4XLocale.new_from_bytes(bytes);
     locale = ICU4XLocale.new("bn");
     const data_provider = ICU4XDataProvider.new_static();
-    const fdf = ICU4XFixedDecimalFormat.try_new(locale, data_provider, ICU4XFixedDecimalFormatOptions.default());
+    const fdf = ICU4XFixedDecimalFormatter.try_new(locale, data_provider, ICU4XFixedDecimalFormatterOptions.default());
     if (!fdf.success) {
         throw "Failed to format fixed decimal";
     }

diff --git a/example/js/lib/test/fixed-decimal-ts.mts b/example/js/lib/test/fixed-decimal-ts.mts
@@ -1,6 +1,6 @@
 import test from 'ava';
 
-import { ICU4XFixedDecimal, ICU4XLocale, ICU4XDataProvider, ICU4XFixedDecimalFormat, ICU4XFixedDecimalFormatOptions } from "../api/index.js"
+import { ICU4XFixedDecimal, ICU4XLocale, ICU4XDataProvider, ICU4XFixedDecimalFormatter, ICU4XFixedDecimalFormatterOptions } from "../api/index.js";
 
 test("multiply a fixed decimal by 1.1", t => {
     const my_decimal = ICU4XFixedDecimal.new(123);
@@ -21,7 +21,7 @@ test("format a fixed decimal", t => {
 
     const data_provider = ICU4XDataProvider.new_static();
 
-    const fdf = ICU4XFixedDecimalFormat.try_new(locale, data_provider, ICU4XFixedDecimalFormatOptions.default());
+    const fdf = ICU4XFixedDecimalFormatter.try_new(locale, data_provider, ICU4XFixedDecimalFormatterOptions.default());
     if (!fdf.success) {
         throw "Failed to format fixed decimal";
     }

diff --git a/example/js/lib/test/fixed-decimal.mjs b/example/js/lib/test/fixed-decimal.mjs
@@ -1,6 +1,6 @@
 import test from 'ava';
 
-import { ICU4XFixedDecimal, ICU4XLocale, ICU4XDataProvider, ICU4XFixedDecimalFormat, ICU4XFixedDecimalFormatOptions } from "../api/index.js"
+import { ICU4XFixedDecimal, ICU4XLocale, ICU4XDataProvider, ICU4XFixedDecimalFormatter, ICU4XFixedDecimalFormatterOptions } from "../api/index.js"
 
 test("multiply a fixed decimal by 0.1", t => {
     const my_decimal = ICU4XFixedDecimal.new(123);
@@ -21,7 +21,7 @@ test("format a fixed decimal", t => {
 
     const data_provider = ICU4XDataProvider.new_static();
 
-    const fdf = ICU4XFixedDecimalFormat.try_new(locale, data_provider, ICU4XFixedDecimalFormatOptions.default());
+    const fdf = ICU4XFixedDecimalFormatter.try_new(locale, data_provider, ICU4XFixedDecimalFormatterOptions.default());
     if (!fdf.success) {
         throw "Failed to format fixed decimal";
     }

diff --git a/tool/src/c/mod.rs b/tool/src/c/mod.rs
@@ -25,9 +25,7 @@ use results::*;
 pub static RUNTIME_H: &str = include_str!("runtime.h");
 
 pub fn gen_bindings(env: &Env, outs: &mut HashMap<String, String>) -> fmt::Result {
-    let diplomat_runtime_out = outs
-        .entry("diplomat_runtime.h".to_string())
-        .or_insert_with(String::new);
+    let diplomat_runtime_out = outs.entry("diplomat_runtime.h".to_string()).or_default();
     write!(diplomat_runtime_out, "{RUNTIME_H}")?;
 
     let all_types = util::get_all_custom_types(env);
@@ -60,9 +58,7 @@ fn gen_struct_header<'a>(
     outs: &mut HashMap<String, String>,
     env: &Env,
 ) -> Result<(), fmt::Error> {
-    let out = outs
-        .entry(format!("{}.h", typ.name()))
-        .or_insert_with(String::new);
+    let out = outs.entry(format!("{}.h", typ.name())).or_default();
 
     writeln!(out, "#ifndef {}_H", typ.name())?;
     writeln!(out, "#define {}_H", typ.name())?;
@@ -193,9 +189,7 @@ fn gen_result_header(
     env: &Env,
 ) -> fmt::Result {
     if let ast::TypeName::Result(ok, err, _) = typ {
-        let out = outs
-            .entry(format!("{}.h", name_for_type(typ)))
-            .or_insert_with(String::new);
+        let out = outs.entry(format!("{}.h", name_for_type(typ))).or_default();
 
         writeln!(out, "#ifndef {}_H", name_for_type(typ))?;
         writeln!(out, "#define {}_H", name_for_type(typ))?;

diff --git a/tool/src/cpp/docs.rs b/tool/src/cpp/docs.rs
@@ -37,9 +37,7 @@ pub fn gen_docs(
         }
     }
 
-    let index_out = outs
-        .entry("index.rst".to_string())
-        .or_insert_with(String::new);
+    let index_out = outs.entry("index.rst".to_string()).or_default();
     writeln!(index_out, "Documentation")?;
     writeln!(index_out, "=============")?;
     writeln!(index_out)?;
@@ -71,7 +69,7 @@ pub fn gen_docs(
         {
             let out = outs
                 .entry(format!("{}.rst", in_path.elements.join("_")))
-                .or_insert_with(String::new);
+                .or_default();
 
             let title = format!("``{}``", in_path.elements.join("::"));
             writeln!(out, "{title}")?;

diff --git a/tool/src/cpp/mod.rs b/tool/src/cpp/mod.rs
@@ -78,17 +78,13 @@ pub fn gen_bindings(
         }
     }
 
-    let diplomat_runtime_out = outs
-        .entry("diplomat_runtime.hpp".to_string())
-        .or_insert_with(String::new);
+    let diplomat_runtime_out = outs.entry("diplomat_runtime.hpp".to_string()).or_default();
     write!(diplomat_runtime_out, "{RUNTIME_HPP}")?;
 
     let all_types = crate::util::get_all_custom_types(env);
 
     for (in_path, typ) in &all_types {
-        let out = outs
-            .entry(format!("{}.hpp", typ.name()))
-            .or_insert_with(String::new);
+        let out = outs.entry(format!("{}.hpp", typ.name())).or_default();
 
         let rendered = render_header(typ.name(), &library_config.headers);
         writeln!(out, "{rendered}").expect("Failed to write string.");

diff --git a/tool/src/dotnet/mod.rs b/tool/src/dotnet/mod.rs
@@ -46,9 +46,7 @@ pub fn gen_bindings(
         }
     }
 
-    let diplomat_runtime_out = outs
-        .entry("DiplomatRuntime.cs".to_owned())
-        .or_insert_with(String::new);
+    let diplomat_runtime_out = outs.entry("DiplomatRuntime.cs".to_owned()).or_default();
     write!(
         diplomat_runtime_out,
         "{}",

diff --git a/tool/src/js/docs.rs b/tool/src/js/docs.rs
@@ -13,9 +13,7 @@ pub fn gen_docs(
     outs: &mut HashMap<String, String>,
     docs_url_gen: &ast::DocsUrlGenerator,
 ) -> fmt::Result {
-    let index_out = outs
-        .entry("index.rst".to_string())
-        .or_insert_with(String::new);
+    let index_out = outs.entry("index.rst".to_string()).or_default();
     writeln!(index_out, "Documentation")?;
     writeln!(index_out, "=============")?;
     writeln!(index_out)?;
@@ -46,7 +44,7 @@ pub fn gen_docs(
         {
             let out = outs
                 .entry(format!("{}.rst", in_path.elements.join("_")))
-                .or_insert_with(String::new);
+                .or_default();
 
             let title = format!("``{}``", in_path.elements.join("::"));
             writeln!(out, "{title}")?;