Selaa lähdekoodia

lib/ignore: Remove unused patterns in cache (#9601)

Tiny cleanup I noticed while trying to fix/test another issue
(https://github.com/syncthing/syncthing/pull/9600). I shortly tried to
figure out what it was used for in the past, but gave up without
results.
Simon Frei 1 vuosi sitten
vanhempi
sitoutus
aea7fa5f22
3 muutettua tiedostoa jossa 5 lisäystä ja 7 poistoa
  1. 3 5
      lib/ignore/cache.go
  2. 1 1
      lib/ignore/cache_test.go
  3. 1 1
      lib/ignore/ignore.go

+ 3 - 5
lib/ignore/cache.go

@@ -19,8 +19,7 @@ type nower interface {
 var clock = nower(defaultClock{})
 
 type cache struct {
-	patterns []Pattern
-	entries  map[string]cacheEntry
+	entries map[string]cacheEntry
 }
 
 type cacheEntry struct {
@@ -28,10 +27,9 @@ type cacheEntry struct {
 	access int64 // Unix nanosecond count. Sufficient until the year 2262.
 }
 
-func newCache(patterns []Pattern) *cache {
+func newCache() *cache {
 	return &cache{
-		patterns: patterns,
-		entries:  make(map[string]cacheEntry),
+		entries: make(map[string]cacheEntry),
 	}
 }
 

+ 1 - 1
lib/ignore/cache_test.go

@@ -21,7 +21,7 @@ func TestCache(t *testing.T) {
 		clock = oldClock
 	}()
 
-	c := newCache(nil)
+	c := newCache()
 
 	res, ok := c.get("nonexistent")
 	if res.IsIgnored() || res.IsDeletable() || ok {

+ 1 - 1
lib/ignore/ignore.go

@@ -205,7 +205,7 @@ func (m *Matcher) parseLocked(r io.Reader, file string) error {
 	m.curHash = newHash
 	m.patterns = patterns
 	if m.withCache {
-		m.matches = newCache(patterns)
+		m.matches = newCache()
 	}
 
 	return err