Style: use impl Trait instead of explicitly-named type parameters.

briansmith · Feb 18, 2021 · ead26ed · ead26ed
1 parent ba54ede
commit ead26ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/der.rs b/src/der.rs
@@ -68,15 +68,15 @@ pub fn read_tag_and_get_value<'a>(
 
 // TODO: investigate taking decoder as a reference to reduce generated code
 // size.
-pub fn nested_of_mut<'a, F, E: Copy>(
+pub fn nested_of_mut<'a, E>(
     input: &mut untrusted::Reader<'a>,
     outer_tag: Tag,
     inner_tag: Tag,
     error: E,
-    mut decoder: F,
+    mut decoder: impl FnMut(&mut untrusted::Reader<'a>) -> Result<(), E>,
 ) -> Result<(), E>
 where
-    F: FnMut(&mut untrusted::Reader<'a>) -> Result<(), E>,
+    E: Copy,
 {
     nested(input, outer_tag, error, |outer| {
         loop {

diff --git a/src/verify_cert.rs b/src/verify_cert.rs
@@ -331,10 +331,12 @@ fn check_eku(
     }
 }
 
-fn loop_while_non_fatal_error<V, F>(values: V, f: F) -> Result<(), Error>
+fn loop_while_non_fatal_error<V>(
+    values: V,
+    f: impl Fn(V::Item) -> Result<(), Error>,
+) -> Result<(), Error>
 where
     V: IntoIterator,
-    F: Fn(V::Item) -> Result<(), Error>,
 {
     for v in values {
         match f(v) {