From f3f478deb98c6bfe5d08267be79c6ffafdf3fc49 Mon Sep 17 00:00:00 2001
From: Robert Haines <rhaines@manchester.ac.uk>
Date: Sun, 22 Sep 2019 17:32:00 +0100
Subject: [PATCH] Configure Naming/MemoizedInstanceVariableName cop.

---
 .rubocop.yml         | 6 ++++++
 .rubocop_rubyzip.yml | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9f59969d..5386aa2d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,6 +16,12 @@ Lint/UselessComparison:
   Exclude:
     - 'test/entry_test.rb'
 
+# Rubocop confuses these as instances of "memoization".
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'lib/zip/extra_field/old_unix.rb'
+    - 'lib/zip/extra_field/unix.rb'
+
 # Allow this multi-line block chain as it actually reads better
 # than the alternatives.
 Style/MultilineBlockChain:
diff --git a/.rubocop_rubyzip.yml b/.rubocop_rubyzip.yml
index 2004b4e1..53c6e9f1 100644
--- a/.rubocop_rubyzip.yml
+++ b/.rubocop_rubyzip.yml
@@ -48,14 +48,6 @@ Naming/AccessorMethodName:
     - 'lib/zip/streamable_stream.rb'
     - 'test/file_permissions_test.rb'
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/zip/extra_field/old_unix.rb'
-    - 'lib/zip/extra_field/unix.rb'
-
 # Offense count: 18
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 Naming/UncommunicativeBlockParamName: