Merging upstream version 1.74.1+dfsg1.

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

8 files changed, 51 insertions, 16 deletions

diff --git a/vendor/syn/src/custom_keyword.rs b/vendor/syn/src/custom_keyword.rs
index 379d159e7..9f3ad8702 100644
--- a/vendor/syn/src/custom_keyword.rs
+++ b/vendor/syn/src/custom_keyword.rs
@@ -224,7 +224,7 @@ macro_rules! impl_clone_for_custom_keyword {
 macro_rules! impl_extra_traits_for_custom_keyword {
     ($ident:ident) => {
         impl $crate::__private::Debug for $ident {
-            fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::fmt::Result {
+            fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::FmtResult {
                 $crate::__private::Formatter::write_str(
                     f,
                     $crate::__private::concat!(
diff --git a/vendor/syn/src/custom_punctuation.rs b/vendor/syn/src/custom_punctuation.rs
index e8cbcd2fe..dba91c17f 100644
--- a/vendor/syn/src/custom_punctuation.rs
+++ b/vendor/syn/src/custom_punctuation.rs
@@ -195,7 +195,7 @@ macro_rules! impl_clone_for_custom_punctuation {
 macro_rules! impl_extra_traits_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
         impl $crate::__private::Debug for $ident {
-            fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::fmt::Result {
+            fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::FmtResult {
                 $crate::__private::Formatter::write_str(f, $crate::__private::stringify!($ident))
             }
         }
diff --git a/vendor/syn/src/export.rs b/vendor/syn/src/export.rs
index 5c06ebdd2..febd322e1 100644
--- a/vendor/syn/src/export.rs
+++ b/vendor/syn/src/export.rs
@@ -1,47 +1,69 @@
+#[doc(hidden)]
 pub use std::clone::Clone;
+#[doc(hidden)]
 pub use std::cmp::{Eq, PartialEq};
+#[doc(hidden)]
 pub use std::concat;
+#[doc(hidden)]
 pub use std::default::Default;
-pub use std::fmt::{self, Debug, Formatter};
+#[doc(hidden)]
+pub use std::fmt::Debug;
+#[doc(hidden)]
 pub use std::hash::{Hash, Hasher};
+#[doc(hidden)]
 pub use std::marker::Copy;
+#[doc(hidden)]
 pub use std::option::Option::{None, Some};
+#[doc(hidden)]
 pub use std::result::Result::{Err, Ok};
+#[doc(hidden)]
 pub use std::stringify;
 
+#[doc(hidden)]
+pub type Formatter<'a> = std::fmt::Formatter<'a>;
+#[doc(hidden)]
+pub type FmtResult = std::fmt::Result;
+
+#[doc(hidden)]
+pub type bool = std::primitive::bool;
+#[doc(hidden)]
+pub type str = std::primitive::str;
+
 #[cfg(feature = "printing")]
+#[doc(hidden)]
 pub use quote;
 
-pub use proc_macro2::{Span, TokenStream as TokenStream2};
+#[doc(hidden)]
+pub type Span = proc_macro2::Span;
+#[doc(hidden)]
+pub type TokenStream2 = proc_macro2::TokenStream;
 
 #[cfg(feature = "parsing")]
+#[doc(hidden)]
 pub use crate::group::{parse_braces, parse_brackets, parse_parens};
 
+#[doc(hidden)]
 pub use crate::span::IntoSpans;
 
 #[cfg(all(feature = "parsing", feature = "printing"))]
+#[doc(hidden)]
 pub use crate::parse_quote::parse as parse_quote;
 
 #[cfg(feature = "parsing")]
+#[doc(hidden)]
 pub use crate::token::parsing::{peek_punct, punct as parse_punct};
 
 #[cfg(feature = "printing")]
+#[doc(hidden)]
 pub use crate::token::printing::punct as print_punct;
 
 #[cfg(feature = "proc-macro")]
-pub use proc_macro::TokenStream;
+#[doc(hidden)]
+pub type TokenStream = proc_macro::TokenStream;
 
 #[cfg(feature = "printing")]
+#[doc(hidden)]
 pub use quote::{ToTokens, TokenStreamExt};
 
-#[allow(non_camel_case_types)]
-pub type bool = help::Bool;
-#[allow(non_camel_case_types)]
-pub type str = help::Str;
-
-mod help {
-    pub type Bool = bool;
-    pub type Str = str;
-}
-
+#[doc(hidden)]
 pub struct private(pub(crate) ());
diff --git a/vendor/syn/src/group.rs b/vendor/syn/src/group.rs
index cccbc467d..273023316 100644
--- a/vendor/syn/src/group.rs
+++ b/vendor/syn/src/group.rs
@@ -7,21 +7,27 @@ use proc_macro2::Delimiter;
 // Not public API.
 #[doc(hidden)]
 pub struct Parens<'a> {
+    #[doc(hidden)]
     pub token: token::Paren,
+    #[doc(hidden)]
     pub content: ParseBuffer<'a>,
 }
 
 // Not public API.
 #[doc(hidden)]
 pub struct Braces<'a> {
+    #[doc(hidden)]
     pub token: token::Brace,
+    #[doc(hidden)]
     pub content: ParseBuffer<'a>,
 }
 
 // Not public API.
 #[doc(hidden)]
 pub struct Brackets<'a> {
+    #[doc(hidden)]
     pub token: token::Bracket,
+    #[doc(hidden)]
     pub content: ParseBuffer<'a>,
 }
 
@@ -29,7 +35,9 @@ pub struct Brackets<'a> {
 #[cfg(any(feature = "full", feature = "derive"))]
 #[doc(hidden)]
 pub struct Group<'a> {
+    #[doc(hidden)]
     pub token: token::Group,
+    #[doc(hidden)]
     pub content: ParseBuffer<'a>,
 }
 
diff --git a/vendor/syn/src/lib.rs b/vendor/syn/src/lib.rs
index b9fd8073f..4adaa8587 100644
--- a/vendor/syn/src/lib.rs
+++ b/vendor/syn/src/lib.rs
@@ -249,7 +249,7 @@
 //!   dynamic library libproc_macro from rustc toolchain.
 
 // Syn types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/syn/2.0.28")]
+#![doc(html_root_url = "https://docs.rs/syn/2.0.29")]
 #![cfg_attr(doc_cfg, feature(doc_cfg))]
 #![allow(non_camel_case_types)]
 #![allow(
diff --git a/vendor/syn/src/parse_quote.rs b/vendor/syn/src/parse_quote.rs
index f5129439c..59e51b41e 100644
--- a/vendor/syn/src/parse_quote.rs
+++ b/vendor/syn/src/parse_quote.rs
@@ -120,6 +120,7 @@ pub fn parse<T: ParseQuote>(token_stream: TokenStream) -> T {
     }
 }
 
+#[doc(hidden)]
 pub trait ParseQuote: Sized {
     fn parse(input: ParseStream) -> Result<Self>;
 }
diff --git a/vendor/syn/src/span.rs b/vendor/syn/src/span.rs
index 50a26b833..eb2779479 100644
--- a/vendor/syn/src/span.rs
+++ b/vendor/syn/src/span.rs
@@ -1,6 +1,7 @@
 use proc_macro2::extra::DelimSpan;
 use proc_macro2::{Delimiter, Group, Span, TokenStream};
 
+#[doc(hidden)]
 pub trait IntoSpans<S> {
     fn into_spans(self) -> S;
 }
diff --git a/vendor/syn/src/token.rs b/vendor/syn/src/token.rs
index c140571a9..c7e0e1f1a 100644
--- a/vendor/syn/src/token.rs
+++ b/vendor/syn/src/token.rs
@@ -974,6 +974,7 @@ pub(crate) mod parsing {
         }
     }
 
+    #[doc(hidden)]
     pub fn punct<const N: usize>(input: ParseStream, token: &str) -> Result<[Span; N]> {
         let mut spans = [input.span(); N];
         punct_helper(input, token, &mut spans)?;
@@ -1006,6 +1007,7 @@ pub(crate) mod parsing {
         })
     }
 
+    #[doc(hidden)]
     pub fn peek_punct(mut cursor: Cursor, token: &str) -> bool {
         for (i, ch) in token.chars().enumerate() {
             match cursor.punct() {
@@ -1033,6 +1035,7 @@ pub(crate) mod printing {
     use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream};
     use quote::TokenStreamExt;
 
+    #[doc(hidden)]
     pub fn punct(s: &str, spans: &[Span], tokens: &mut TokenStream) {
         assert_eq!(s.len(), spans.len());