chore: Update code for newest rust 1.54 (#231)

* Address newest clippy concerns

Dockerfile

@@ -4,7 +4,7 @@
 ARG APPNAME=contile
 
 # make sure that the build and run environments are the same version
-FROM rust:1.53-slim-buster as builder
+FROM rust:1.54-slim-buster as builder
 ARG APPNAME
 ADD . /app
 WORKDIR /app

src/adm/filter.rs

@@ -94,7 +94,7 @@ impl AdmFilter {
             Err(e) => {
                 tags.add_tag("type", species);
                 tags.add_extra("tile", &tile.name);
-                tags.add_extra("url", &url);
+                tags.add_extra("url", url);
                 tags.add_extra("parse_error", &e.to_string());
                 return Err(HandlerErrorKind::InvalidHost(species, url.to_string()).into());
             }
@@ -126,7 +126,7 @@ impl AdmFilter {
             Err(e) => {
                 tags.add_tag("type", species);
                 tags.add_extra("tile", &tile.name);
-                tags.add_extra("url", &url);
+                tags.add_extra("url", url);
 
                 tags.add_extra("parse_error", &e.to_string());
                 return Err(HandlerErrorKind::InvalidHost(species, url.to_string()).into());
@@ -142,7 +142,7 @@ impl AdmFilter {
             trace!("bad url: url={:?}", url.to_string());
             tags.add_tag("type", species);
             tags.add_extra("tile", &tile.name);
-            tags.add_extra("url", &url);
+            tags.add_extra("url", url);
 
             tags.add_extra("reason", "bad host");
             return Err(HandlerErrorKind::InvalidHost(species, url.to_string()).into());
@@ -152,10 +152,10 @@ impl AdmFilter {
                 trace!("missing param: key={:?} url={:?}", &key, url.to_string());
                 tags.add_tag("type", species);
                 tags.add_extra("tile", &tile.name);
-                tags.add_extra("url", &url);
+                tags.add_extra("url", url);
 
                 tags.add_extra("reason", "missing required query param");
-                tags.add_extra("param", &key);
+                tags.add_extra("param", key);
                 return Err(HandlerErrorKind::InvalidHost(species, url.to_string()).into());
             }
         }
@@ -164,7 +164,7 @@ impl AdmFilter {
                 trace!("invalid param key={:?} url={:?}", &key, url.to_string());
                 tags.add_tag("type", species);
                 tags.add_extra("tile", &tile.name);
-                tags.add_extra("url", &url);
+                tags.add_extra("url", url);
 
                 tags.add_extra("reason", "invalid query param");
                 tags.add_extra("param", &key);
@@ -190,7 +190,7 @@ impl AdmFilter {
             Err(e) => {
                 tags.add_tag("type", species);
                 tags.add_extra("tile", &tile.name);
-                tags.add_extra("url", &url);
+                tags.add_extra("url", url);
                 tags.add_extra("parse_error", &e.to_string());
                 return Err(HandlerErrorKind::InvalidHost(species, url.to_string()).into());
             }
@@ -204,7 +204,7 @@ impl AdmFilter {
             trace!("missing param key=id url={:?}", url.to_string());
             tags.add_tag("type", species);
             tags.add_extra("tile", &tile.name);
-            tags.add_extra("url", &url);
+            tags.add_extra("url", url);
             tags.add_extra("reason", "invalid query param");
             tags.add_extra("param", "id");
             return Err(HandlerErrorKind::InvalidHost(species, url.to_string()).into());

src/metrics.rs

@@ -44,7 +44,7 @@ impl Drop for Metrics {
                 let tags = timer.tags.tags.clone();
                 let keys = tags.keys();
                 for tag in keys {
-                    tagged = tagged.with_tag(tag, &tags.get(tag).unwrap())
+                    tagged = tagged.with_tag(tag, tags.get(tag).unwrap())
                 }
                 match tagged.try_send() {
                     Err(e) => {
@@ -146,7 +146,7 @@ impl Metrics {
             }
             for key in mtags.tags.keys().clone() {
                 if let Some(val) = mtags.tags.get(key) {
-                    tagged = tagged.with_tag(&key, val.as_ref());
+                    tagged = tagged.with_tag(key, val.as_ref());
                 }
             }
             // Include any "hard coded" tags.
@@ -176,7 +176,7 @@ impl Metrics {
             }
             for key in mtags.tags.keys().clone() {
                 if let Some(val) = mtags.tags.get(key) {
-                    tagged = tagged.with_tag(&key, val.as_ref());
+                    tagged = tagged.with_tag(key, val.as_ref());
                 }
             }
             // Include any "hard coded" tags.

src/server/img_storage.rs

@@ -355,7 +355,7 @@ impl StoreImage {
                     return Err(err);
                 }
             };
-            self.meta(&image, fmt)?
+            self.meta(image, fmt)?
         };
         if self.settings.metrics.symmetric && image_metrics.width != image_metrics.height {
             let mut tags = Tags::default();

src/server/location.rs

@@ -334,7 +334,7 @@ impl Location {
         match self.iploc.clone().unwrap().lookup::<City<'_>>(ip_addr) {
             Ok(location) => {
                 if let Some(names) = location.city.and_then(|c| c.names) {
-                    result.city = get_preferred_language_element(&preferred_languages, &names)
+                    result.city = get_preferred_language_element(preferred_languages, &names)
                 } else {
                     metrics.incr_with_tags("location.unknown.city", Some(&tags));
                 };
@@ -472,7 +472,7 @@ pub mod test {
         let hv = "US, USCA";
         test_head.headers_mut().append(
             HeaderName::from_static(test_header),
-            HeaderValue::from_static(&hv),
+            HeaderValue::from_static(hv),
         );
 
         let loc = LocationResult::from_header(&test_head, &settings, &metrics);
@@ -502,7 +502,7 @@ pub mod test {
         let hv = ", ";
         test_head.headers_mut().append(
             HeaderName::from_static(GOOG_LOC_HEADER),
-            HeaderValue::from_static(&hv),
+            HeaderValue::from_static(hv),
         );
         let loc = LocationResult::from_header(&test_head, &settings, &metrics);
         assert!(loc.region() == "");

src/tags.rs

@@ -43,7 +43,7 @@ const VALID_UA_OS: &[&str] = &["Firefox OS", "Linux", "Mac OSX"];
 /// metrics and logging).
 pub fn parse_user_agent(agent: &str) -> (WootheeResult<'_>, &str) {
     let parser = Parser::new();
-    let wresult = parser.parse(&agent).unwrap_or_else(|| WootheeResult {
+    let wresult = parser.parse(agent).unwrap_or_else(|| WootheeResult {
         name: "",
         category: "",
         os: "",
@@ -294,7 +294,7 @@ impl From<Tags> for BTreeMap<String, String> {
 impl KV for Tags {
     fn serialize(&self, _rec: &Record<'_>, serializer: &mut dyn slog::Serializer) -> slog::Result {
         for (key, val) in &self.tags {
-            serializer.emit_str(Key::from(key.clone()), &val)?;
+            serializer.emit_str(Key::from(key.clone()), val)?;
         }
         Ok(())
     }

src/web/extractors.rs

@@ -38,7 +38,7 @@ impl FromRequest for DeviceInfo {
                 .unwrap_or(&EMPTY_HEADER)
                 .to_str()
                 .unwrap_or_default();
-            Ok(get_device_info(&ua)?)
+            Ok(get_device_info(ua)?)
         }
         .boxed_local()
     }

src/web/handlers.rs

@@ -97,8 +97,8 @@ pub async fn get_tiles(
                     metrics.incr_with_tags("tiles.invalid", Some(&tags));
                     // Report directly to sentry
                     // (This is starting to become a pattern. 🤔)
-                    let mut tags = Tags::from_head(request.head(), &settings);
-                    tags.add_extra("err", &es);
+                    let mut tags = Tags::from_head(request.head(), settings);
+                    tags.add_extra("err", es);
                     tags.add_tag("level", "warning");
                     l_sentry::report(&tags, sentry::event_from_error(&e));
                     warn!("ADM Server error: {:?}", e);

src/web/test.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use actix_cors::Cors;
 use actix_web::{
-    dev, http::header, http::StatusCode, middleware::errhandlers::ErrorHandlers, test, web, App,
+    http::header, http::StatusCode, middleware::errhandlers::ErrorHandlers, test, web, App,
     HttpRequest, HttpResponse, HttpServer,
 };
 use futures::{channel::mpsc, StreamExt};
@@ -66,7 +66,6 @@ macro_rules! init_app {
 }
 
 struct MockAdm {
-    pub server: dev::Server,
     pub endpoint_url: String,
     pub request_rx: mpsc::UnboundedReceiver<String>,
 }
@@ -111,8 +110,8 @@ fn init_mock_adm(response: String) -> MockAdm {
         .bind(("127.0.0.1", 0))
         .expect("Couldn't bind mock_adm");
     let addr = server.addrs().pop().expect("No mock_adm addr");
+    server.run();
     MockAdm {
-        server: server.run(),
         endpoint_url: format!("http://{}:{}/?partner=foo&sub1=bar", addr.ip(), addr.port()),
         request_rx,
     }
@@ -372,11 +371,9 @@ async fn basic_default() {
     let tiles = result["tiles"].as_array().expect("!tiles.is_array()");
     // remember, we cap at `settings.adm_max_tiles` (currently 2)
     assert_eq!(tiles.len(), 2);
-    let names: Vec<&str> = tiles
+    assert!(!tiles
         .iter()
-        .map(|tile| tile["name"].as_str().unwrap())
-        .collect();
-    assert!(!names.contains(&"Los Pollos Hermanos"));
+        .any(|tile| tile["name"].as_str().unwrap() == "Los Pollos Hermanos"));
 }
 
 #[actix_rt::test]

src/web/user_agent.rs

@@ -60,7 +60,7 @@ pub fn get_device_info(ua: &str) -> HandlerResult<DeviceInfo> {
         // XXX: Tags::from_head already adds this
         err.tags.add_extra("ua", ua);
         err.tags
-            .add_extra("name", &wresult.name.to_lowercase().as_str());
+            .add_extra("name", wresult.name.to_lowercase().as_str());
         return Err(err);
     }