From c830c9971bc7d9f7cf553bf0187ab15273301a0b Mon Sep 17 00:00:00 2001
From: Martin Hoffmann <hn@nvnc.de>
Date: Tue, 12 Feb 2019 18:05:02 +0100
Subject: [PATCH] Compatibility with Rust 1.30.

---
 src/lib.rs        | 1 +
 src/operation.rs  | 2 +-
 src/repository.rs | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 456d7ea..d163320 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,6 +2,7 @@
 //!
 //! This crate contains all the moving parts of the Routinator. The
 //! application itself, via `main.rs` is only a very tiny frontend.
+#![allow(unknown_lints)] // Clippy for 1.30.
 
 extern crate bytes;
 extern crate chrono;
diff --git a/src/operation.rs b/src/operation.rs
index 1ada3ff..8b70fdd 100644
--- a/src/operation.rs
+++ b/src/operation.rs
@@ -52,7 +52,7 @@ pub enum Operation {
         /// Output is requested by this being some. If there is a path,
         /// then we output to the file identified by the path, otherwise
         /// we print to stdout.
-        #[allow(clippy::option_option)]
+        #[allow(option_option)]
         output: Option<Option<PathBuf>>,
     },
 
diff --git a/src/repository.rs b/src/repository.rs
index 74f10a7..f44a9cc 100644
--- a/src/repository.rs
+++ b/src/repository.rs
@@ -733,7 +733,7 @@ impl Repository {
 /// # Rsyncing
 ///
 impl Repository {
-    #[allow(clippy::mutex_atomic)] // XXX Double check maybe they are right?
+    #[allow(mutex_atomic)] // XXX Double check maybe they are right?
     fn rsync_module(&self, module: &uri::RsyncModule) {
         if let Some((ref state, ref command)) = self.0.rsync {
             if state.lock().unwrap().have_seen(module) {
@@ -775,7 +775,7 @@ struct RsyncState {
     /// The first element of each list item is the module for which the
     /// process runs, the second is a conditional variable that is going
     /// to be triggered when the process finishes.
-    #[allow(clippy::type_complexity)]
+    #[allow(type_complexity)]
     running: Vec<(uri::RsyncModule, Arc<(Mutex<bool>, Condvar)>)>,
 
     /// The rsync modules we already tried in this iteration.
@@ -790,7 +790,7 @@ impl RsyncState {
         }
     }
 
-    #[allow(clippy::type_complexity, clippy::mutex_atomic)]
+    #[allow(type_complexity, mutex_atomic)]
     fn get_running(
         &mut self,
         module: &uri::RsyncModule