Merging upstream version 1.71.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 2 insertions, 8 deletions

diff --git a/vendor/base64ct/src/decoder.rs b/vendor/base64ct/src/decoder.rs
index 8d500b578..b10104691 100644
--- a/vendor/base64ct/src/decoder.rs
+++ b/vendor/base64ct/src/decoder.rs
@@ -166,7 +166,6 @@ impl<'i, E: Encoding> Decoder<'i, E> {
     /// If successful, this function will return the total number of bytes
     /// decoded into `buf`.
     #[cfg(feature = "alloc")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
     pub fn decode_to_end<'o>(&mut self, buf: &'o mut Vec<u8>) -> Result<&'o [u8], Error> {
         let start_len = buf.len();
         let remaining_len = self.remaining_len();
@@ -249,7 +248,6 @@ impl<'i, E: Encoding> Decoder<'i, E> {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl<'i, E: Encoding> io::Read for Decoder<'i, E> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         if self.is_finished() {
diff --git a/vendor/base64ct/src/encoder.rs b/vendor/base64ct/src/encoder.rs
index 74d457efc..0ce8c2f36 100644
--- a/vendor/base64ct/src/encoder.rs
+++ b/vendor/base64ct/src/encoder.rs
@@ -166,7 +166,6 @@ impl<'o, E: Encoding> Encoder<'o, E> {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl<'o, E: Encoding> io::Write for Encoder<'o, E> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         self.encode(buf)?;
diff --git a/vendor/base64ct/src/encoding.rs b/vendor/base64ct/src/encoding.rs
index 36f37e175..83cbc32fe 100644
--- a/vendor/base64ct/src/encoding.rs
+++ b/vendor/base64ct/src/encoding.rs
@@ -40,7 +40,6 @@ pub trait Encoding: Alphabet {
 
     /// Decode a Base64 string into a byte vector.
     #[cfg(feature = "alloc")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
     fn decode_vec(input: &str) -> Result<Vec<u8>, Error>;
 
     /// Encode the input byte slice as Base64.
@@ -54,7 +53,6 @@ pub trait Encoding: Alphabet {
     /// # Panics
     /// If `input` length is greater than `usize::MAX/4`.
     #[cfg(feature = "alloc")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
     fn encode_string(input: &[u8]) -> String;
 
     /// Get the length of Base64 produced by encoding the given bytes.
diff --git a/vendor/base64ct/src/errors.rs b/vendor/base64ct/src/errors.rs
index 0ea417173..de08e6981 100644
--- a/vendor/base64ct/src/errors.rs
+++ b/vendor/base64ct/src/errors.rs
@@ -73,7 +73,6 @@ impl From<core::str::Utf8Error> for Error {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl From<Error> for std::io::Error {
     fn from(err: Error) -> std::io::Error {
         // TODO(tarcieri): better customize `ErrorKind`?
@@ -82,5 +81,4 @@ impl From<Error> for std::io::Error {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl std::error::Error for Error {}
diff --git a/vendor/base64ct/src/lib.rs b/vendor/base64ct/src/lib.rs
index b374cefe5..f1094f9f1 100644
--- a/vendor/base64ct/src/lib.rs
+++ b/vendor/base64ct/src/lib.rs
@@ -1,5 +1,5 @@
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
@@ -7,6 +7,7 @@
 #![doc = include_str!("../README.md")]
 #![warn(
     clippy::integer_arithmetic,
+    clippy::mod_module_files,
     clippy::panic,
     clippy::panic_in_result_fn,
     clippy::unwrap_used,