From 80afb5bd117735cb183669a4b30468516bfa07ce Mon Sep 17 00:00:00 2001
From: Malte Tammena <malte.tammena@pm.me>
Date: Sun, 26 Jun 2022 16:29:21 +0200
Subject: [PATCH] Fix linter warnings

---
 Cargo.toml             |  2 --
 src/cache/fetchable.rs |  2 +-
 src/main.rs            |  1 -
 src/request/mod.rs     |  2 +-
 src/request/reqwest.rs | 20 ++++++++------------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 917a07b..d92faf0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2021"]
-
 [package]
 name = "mensa"
 version = "0.5.0"
diff --git a/src/cache/fetchable.rs b/src/cache/fetchable.rs
index e438287..0ed2518 100644
--- a/src/cache/fetchable.rs
+++ b/src/cache/fetchable.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::error::Result;
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(from = "T", untagged)]
 pub enum Fetchable<T> {
     /// The value does not exist, but can be fetched.
diff --git a/src/main.rs b/src/main.rs
index 2b9d9e7..6ac28b6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(macro_attributes_in_derive_output)]
 //! <img src="https://raw.githubusercontent.com/MalteT/mensa/main/static/logo.png" alt="mensa CLI logo" width="400" align="right">
 //!
 //! [![tests](https://github.com/MalteT/mensa/actions/workflows/rust.yml/badge.svg)](https://github.com/MalteT/mensa/actions/workflows/rust.yml)
diff --git a/src/request/mod.rs b/src/request/mod.rs
index 2747e40..5fa5f92 100644
--- a/src/request/mod.rs
+++ b/src/request/mod.rs
@@ -14,7 +14,7 @@ mod dummy;
 pub use self::dummy::DummyApi as DefaultApi;
 
 /// Assortment of headers relevant to the program.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[non_exhaustive]
 pub struct Headers {
     pub etag: Option<String>,
diff --git a/src/request/reqwest.rs b/src/request/reqwest.rs
index aafc17d..d7a36e0 100644
--- a/src/request/reqwest.rs
+++ b/src/request/reqwest.rs
@@ -55,33 +55,29 @@ impl From<reqwest::header::HeaderMap> for Headers {
         use reqwest::header::*;
         let etag = map
             .get(ETAG)
-            .map(|raw| {
+            .and_then(|raw| {
                 let utf8 = raw.to_str().ok()?;
                 Some(utf8.to_string())
-            })
-            .flatten();
+            });
         let this_page = map
             .get("x-current-page")
-            .map(|raw| {
+            .and_then(|raw| {
                 let utf8 = raw.to_str().ok()?;
                 utf8.parse().ok()
-            })
-            .flatten();
+            });
         let next_page = map
             .get(LINK)
-            .map(|raw| {
+            .and_then(|raw| {
                 let utf8 = raw.to_str().ok()?;
                 let captures = LINK_NEXT_PAGE_RE.captures(utf8)?;
                 Some(captures[1].to_owned())
-            })
-            .flatten();
+            });
         let last_page = map
             .get("x-total-pages")
-            .map(|raw| {
+            .and_then(|raw| {
                 let utf8 = raw.to_str().ok()?;
                 utf8.parse().ok()
-            })
-            .flatten();
+            });
         Self {
             etag,
             this_page,