From 1e03be8b5b7409801559bd4e3b20d378d9c81a85 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Fri, 12 Jun 2020 21:17:36 -0600
Subject: [PATCH] Suppress "unused unit" warnings from Clippy in the generated
 code

PR #148 fixed it for the master branch; this commit fixes it for the
2020_refactor branch.

Issue #142
---
 mockall_derive/src/mock_item.rs        | 3 +++
 mockall_derive/src/mock_item_struct.rs | 6 ++++++
 mockall_derive/src/mockable_item.rs    | 1 +
 3 files changed, 10 insertions(+)

diff --git a/mockall_derive/src/mock_item.rs b/mockall_derive/src/mock_item.rs
index 3fc37f71..c9261c0c 100644
--- a/mockall_derive/src/mock_item.rs
+++ b/mockall_derive/src/mock_item.rs
@@ -189,6 +189,9 @@ impl ToTokens for MockItemModule {
         };
         quote!(
             #docstr
+            // TODO: remove the allow unused_unit
+            // https://github.com/asomers/mockall/issues/149
+            #[allow(clippy::unused_unit)]
             pub mod #modname {
                 #body
         }).to_tokens(tokens);
diff --git a/mockall_derive/src/mock_item_struct.rs b/mockall_derive/src/mock_item_struct.rs
index e53eb755..606f18f8 100644
--- a/mockall_derive/src/mock_item_struct.rs
+++ b/mockall_derive/src/mock_item_struct.rs
@@ -267,6 +267,9 @@ impl ToTokens for MockItemStruct {
         let vis = &self.vis;
         quote!(
             #[allow(non_snake_case)]
+            // TODO: remove the allow unused_unit
+            // https://github.com/asomers/mockall/issues/149
+            #[allow(clippy::unused_unit)]
             #[doc(hidden)]
             pub mod #modname {
                 use super::*;
@@ -342,6 +345,9 @@ impl ToTokens for MockItemTraitImpl {
         let priv_mods = self.methods.priv_mods();
         quote!(
             #[allow(non_snake_case)]
+            // TODO: remove the allow unused_unit
+            // https://github.com/asomers/mockall/issues/149
+            #[allow(clippy::unused_unit)]
             #[doc(hidden)]
             pub mod #modname {
                 use super::*;
diff --git a/mockall_derive/src/mockable_item.rs b/mockall_derive/src/mockable_item.rs
index e8a374d7..fb130714 100644
--- a/mockall_derive/src/mockable_item.rs
+++ b/mockall_derive/src/mockable_item.rs
@@ -98,6 +98,7 @@ impl From<(Attrs, ItemForeignMod)> for MockableModule {
                                 // Add an explicit "-> ()" for perfect
                                 // compatibility with 0.7.0.  TODO: remove this
                                 // after merging the 2020_refactor branch
+                                // https://github.com/asomers/mockall/issues/149
                                 let rarrow = Token![->](sig.output.span());
                                 let unit = Type::Tuple(TypeTuple{
                                     paren_token: token::Paren::default(),