chore: update 12/2/21 (#1181)

Updates for the new rust version
mozilla-services · Dec 3, 2021 · 04cf234 · 04cf234
1 parent bed59e2
commit 04cf234
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.54-buster as builder
+FROM rust:1.57-buster as builder
 WORKDIR /app
 ADD . /app
 ENV PATH=$PATH:/root/.cargo/bin

diff --git a/src/db/mysql/batch.rs b/src/db/mysql/batch.rs
@@ -189,7 +189,6 @@ pub fn do_append(
     #[derive(Debug, QueryableByName)]
     #[table_name = "batch_upload_items"]
     struct ExistsResult {
-        user_id: i64,
         batch_id: i64,
         id: String,
     }

diff --git a/src/web/tags.rs b/src/web/tags.rs
@@ -18,21 +18,12 @@ use slog::{Key, Record, KV};
 
 use crate::server::user_agent::parse_user_agent;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct Tags {
     pub tags: HashMap<String, String>,
     pub extra: HashMap<String, String>,
 }
 
-impl Default for Tags {
-    fn default() -> Tags {
-        Tags {
-            tags: HashMap::new(),
-            extra: HashMap::new(),
-        }
-    }
-}
-
 impl Serialize for Tags {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where