diff options
author | Matthew Maurer <mmaurer@google.com> | 2023-05-26 23:48:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-26 23:48:37 +0000 |
commit | 48fc21558e47602190cb53f5f476fc99a9929d4b (patch) | |
tree | 9fbee739478ab8ee4dc64d2187be48e387832841 | |
parent | 7f45468278efb392f9554b5db3c633e0adf89d9f (diff) | |
parent | 883b76d3fa8db51d5fcccc05cc847e1680758d7f (diff) | |
download | syn-mid-48fc21558e47602190cb53f5f476fc99a9929d4b.tar.gz |
Update to syn-2 am: 971a9d6cf1 am: b6890e6816 am: 883b76d3fa
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/syn-mid/+/2522319
Change-Id: I06a05bef9707a4034d9e1394eaff15909861c878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | patches/syn-2.patch | 50 | ||||
-rw-r--r-- | src/func.rs | 11 |
2 files changed, 56 insertions, 5 deletions
diff --git a/patches/syn-2.patch b/patches/syn-2.patch new file mode 100644 index 0000000..a25bd0c --- /dev/null +++ b/patches/syn-2.patch @@ -0,0 +1,50 @@ +diff --git a/src/func.rs b/src/func.rs +index a53e63b..384e80b 100644 +--- a/src/func.rs ++++ b/src/func.rs +@@ -85,11 +85,12 @@ mod parsing { + + impl Parse for Signature { + fn parse(input: ParseStream<'_>) -> Result<Self> { ++ #[allow(clippy::trivially_copy_pass_by_ref)] + fn get_variadic(input: &&FnArg) -> Option<Variadic> { + if let FnArg::Typed(PatType { ty, .. }) = input { + if let Type::Verbatim(tokens) = &**ty { + if let Ok(dots) = parse2(tokens.clone()) { +- return Some(Variadic { attrs: Vec::new(), dots }); ++ return Some(Variadic { attrs: Vec::new(), pat: None, comma: None, dots }); + } + } + } +@@ -106,7 +107,7 @@ mod parsing { + + let content; + let paren_token = parenthesized!(content in input); +- let inputs = content.parse_terminated(FnArg::parse)?; ++ let inputs = content.parse_terminated(FnArg::parse, Token![,])?; + let variadic = inputs.last().as_ref().and_then(get_variadic); + + let output: ReturnType = input.parse()?; +@@ -119,11 +120,11 @@ mod parsing { + abi, + fn_token, + ident, ++ generics, + paren_token, + inputs, +- output, + variadic, +- generics, ++ output, + }) + } + } +@@ -210,7 +211,7 @@ mod printing { + FnArg::Receiver(_) => return false, + }; + +- let tokens = match pat.ty.as_ref() { ++ let tokens = match &*pat.ty { + Type::Verbatim(tokens) => tokens, + _ => return false, + }; diff --git a/src/func.rs b/src/func.rs index a53e63b..384e80b 100644 --- a/src/func.rs +++ b/src/func.rs @@ -85,11 +85,12 @@ mod parsing { impl Parse for Signature { fn parse(input: ParseStream<'_>) -> Result<Self> { + #[allow(clippy::trivially_copy_pass_by_ref)] fn get_variadic(input: &&FnArg) -> Option<Variadic> { if let FnArg::Typed(PatType { ty, .. }) = input { if let Type::Verbatim(tokens) = &**ty { if let Ok(dots) = parse2(tokens.clone()) { - return Some(Variadic { attrs: Vec::new(), dots }); + return Some(Variadic { attrs: Vec::new(), pat: None, comma: None, dots }); } } } @@ -106,7 +107,7 @@ mod parsing { let content; let paren_token = parenthesized!(content in input); - let inputs = content.parse_terminated(FnArg::parse)?; + let inputs = content.parse_terminated(FnArg::parse, Token![,])?; let variadic = inputs.last().as_ref().and_then(get_variadic); let output: ReturnType = input.parse()?; @@ -119,11 +120,11 @@ mod parsing { abi, fn_token, ident, + generics, paren_token, inputs, - output, variadic, - generics, + output, }) } } @@ -210,7 +211,7 @@ mod printing { FnArg::Receiver(_) => return false, }; - let tokens = match pat.ty.as_ref() { + let tokens = match &*pat.ty { Type::Verbatim(tokens) => tokens, _ => return false, }; |