Update dependencies and use new LruCache 0.8 API

Hainish · Hainish · commit 92516789c53f · 2022-09-13T11:16:32.000-07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ flate2 = { version = "1.0", optional = true }
 lazy_static = { version = "1.4", optional = true }
 url = { version = "2", optional = true }
 regex = { version = "1", optional = true }
-lru = { version = "0.7", optional = true }
+lru = { version = "0.8", optional = true }
 bloomfilter = { version = "1.0", optional = true }
 ring = { version = "0.16", optional = true }
 cfg-if = "1.0"
diff --git a/src/rewriter.rs b/src/rewriter.rs
@@ -1,6 +1,7 @@
 use lru::LruCache;
 use regex::Regex;
 use std::error::Error;
+use std::num::NonZeroUsize;
 use std::sync::{Arc, atomic::{AtomicUsize, Ordering}, Mutex};
 use std::collections::VecDeque;
 
@@ -47,7 +48,7 @@ impl Rewriter {
             blooms: Arc::new(Mutex::new(vec![])),
             settings,
             rewrite_count: AtomicUsize::new(0),
-            cookie_host_safety_cache: LruCache::new(250), // 250 is somewhat arbitrary
+            cookie_host_safety_cache: LruCache::new(NonZeroUsize::new(250).unwrap()), // 250 is somewhat arbitrary
             rewrite_history: VecDeque::with_capacity(15),
         }
     }
@@ -275,7 +276,7 @@ impl NewRewriterWithBloom for Rewriter {
             blooms,
             settings,
             rewrite_count: AtomicUsize::new(0),
-            cookie_host_safety_cache: LruCache::new(250), // 250 is somewhat arbitrary
+            cookie_host_safety_cache: LruCache::new(NonZeroUsize::new(250).unwrap()), // 250 is somewhat arbitrary
             rewrite_history: VecDeque::with_capacity(15),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`use lru::LruCache;`
`2`	`2`	`use regex::Regex;`
`3`	`3`	`use std::error::Error;`
	`4`	`+use std::num::NonZeroUsize;`
`4`	`5`	`use std::sync::{Arc, atomic::{AtomicUsize, Ordering}, Mutex};`
`5`	`6`	`use std::collections::VecDeque;`
`6`	`7`
`@@ -47,7 +48,7 @@ impl Rewriter {`
`47`	`48`	`blooms: Arc::new(Mutex::new(vec![])),`
`48`	`49`	`settings,`
`49`	`50`	`rewrite_count: AtomicUsize::new(0),`
`50`		`- cookie_host_safety_cache: LruCache::new(250), // 250 is somewhat arbitrary`
	`51`	`+ cookie_host_safety_cache: LruCache::new(NonZeroUsize::new(250).unwrap()), // 250 is somewhat arbitrary`
`51`	`52`	`rewrite_history: VecDeque::with_capacity(15),`
`52`	`53`	`}`
`53`	`54`	`}`
`@@ -275,7 +276,7 @@ impl NewRewriterWithBloom for Rewriter {`
`275`	`276`	`blooms,`
`276`	`277`	`settings,`
`277`	`278`	`rewrite_count: AtomicUsize::new(0),`
`278`		`- cookie_host_safety_cache: LruCache::new(250), // 250 is somewhat arbitrary`
	`279`	`+ cookie_host_safety_cache: LruCache::new(NonZeroUsize::new(250).unwrap()), // 250 is somewhat arbitrary`
`279`	`280`	`rewrite_history: VecDeque::with_capacity(15),`
`280`	`281`	`}`
`281`	`282`	`}`