From: Benjamin Gill <github@bgill.eu>
Date: Sat, 16 Jun 2018 11:59:44 +0000 (+0100)
Subject: Fix new renamed_and_removed_lints warning (#247)
X-Git-Tag: archive/raspbian/1.32.0+dfsg1-1+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f7502e1dc93a26eaee399dbb620f9d7d8ce8452c;p=rustc.git

Fix new renamed_and_removed_lints warning (#247)

I've verified that this now produces no warnings with Rust 1.26.1 and
1.28.0-nightly (c3b09c968 2018-05-27)

Gbp-Pq: Name u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch
---

diff --git a/vendor/error-chain-0.11.0/src/error_chain.rs b/vendor/error-chain-0.11.0/src/error_chain.rs
index cbd42cd67e..0926c88892 100644
--- a/vendor/error-chain-0.11.0/src/error_chain.rs
+++ b/vendor/error-chain-0.11.0/src/error_chain.rs
@@ -173,7 +173,7 @@ macro_rules! impl_error_chain_processed {
                 self.0.description()
             }
 
-            #[allow(unknown_lints, unused_doc_comment)]
+            #[allow(unknown_lints, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
             fn cause(&self) -> Option<&::std::error::Error> {
                 match self.1.next_error {
                     Some(ref c) => Some(&**c),
@@ -424,7 +424,7 @@ macro_rules! impl_extract_backtrace {
     ($error_name: ident
      $error_kind_name: ident
      $([$link_error_path: path, $(#[$meta_links: meta])*])*) => {
-        #[allow(unknown_lints, unused_doc_comment)]
+        #[allow(unknown_lints, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
         fn extract_backtrace(e: &(::std::error::Error + Send + 'static))
             -> Option<::std::sync::Arc<$crate::Backtrace>> {
             if let Some(e) = e.downcast_ref::<$error_name>() {
diff --git a/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs b/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
index d6c05c8a88..d5e266389c 100644
--- a/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
+++ b/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
@@ -264,7 +264,7 @@ macro_rules! impl_error_chain_kind {
             $item:ident: $imode:tt [$(#[$imeta:meta])*] [$( $var:ident: $typ:ty ),*] {$( $funcs:tt )*}
         )*}
     ) => {
-        #[allow(unknown_lints, unused, unused_doc_comment)]
+        #[allow(unknown_lints, unused, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
         impl ::std::fmt::Display for $name {
             fn fmt(&self, fmt: &mut ::std::fmt::Formatter)
                 -> ::std::fmt::Result
@@ -316,7 +316,7 @@ macro_rules! impl_error_chain_kind {
                 }
             }
         }*/
-        #[allow(unknown_lints, unused, unused_doc_comment)]
+        #[allow(unknown_lints, unused, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
         impl $name {
             /// A string describing the error kind.
             pub fn description(&self) -> &str {
diff --git a/vendor/error-chain-0.11.0/src/lib.rs b/vendor/error-chain-0.11.0/src/lib.rs
index d0881fcef1..6421194f8c 100644
--- a/vendor/error-chain-0.11.0/src/lib.rs
+++ b/vendor/error-chain-0.11.0/src/lib.rs
@@ -1,5 +1,4 @@
 #![deny(missing_docs)]
-#![allow(unknown_lints)] // to be removed when unused_doc_comments lints is merged
 #![doc(html_root_url = "https://docs.rs/error-chain/0.11.0")]
 
 //! A library for consistent and reliable error handling