clippy

rust-diplomat · Nov 22, 2023 · eeef4bd · eeef4bd
1 parent 872e856
commit eeef4bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/core/src/ast/types.rs b/core/src/ast/types.rs
@@ -392,6 +392,7 @@ pub enum TypeName {
 }
 
 #[derive(Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Debug, Copy)]
+#[non_exhaustive]
 pub enum StringEncoding {
     UnvalidatedUtf8,
     UnvalidatedUtf16,

diff --git a/macro/src/lib.rs b/macro/src/lib.rs
@@ -15,14 +15,21 @@ fn cfgs_to_stream(attrs: &[Attribute]) -> proc_macro2::TokenStream {
 
 fn gen_params_at_boundary(param: &ast::Param, expanded_params: &mut Vec<FnArg>) {
     match &param.ty {
-        ast::TypeName::StrReference(..) | ast::TypeName::PrimitiveSlice(..) => {
+        ast::TypeName::StrReference(
+            ..,
+            ast::StringEncoding::UnvalidatedUtf8 | ast::StringEncoding::UnvalidatedUtf16,
+        )
+        | ast::TypeName::PrimitiveSlice(..) => {
             let data_type = if let ast::TypeName::PrimitiveSlice(.., prim) = &param.ty {
                 ast::TypeName::Primitive(*prim).to_syn().to_token_stream()
-            } else if let ast::TypeName::StrReference(_, e) = &param.ty {
-                match e {
-                    ast::StringEncoding::UnvalidatedUtf8 => quote! { u8 },
-                    ast::StringEncoding::UnvalidatedUtf16 => quote! { u16 },
-                }
+            } else if let ast::TypeName::StrReference(_, ast::StringEncoding::UnvalidatedUtf8) =
+                &param.ty
+            {
+                quote! { u8 }
+            } else if let ast::TypeName::StrReference(_, ast::StringEncoding::UnvalidatedUtf16) =
+                &param.ty
+            {
+                quote! { u16 }
             } else {
                 unreachable!()
             };