commit b8f35f3e915eae4a156942bc4450f57627ba63b0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 26 19:01:13 2023
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 26 19:01:13 2023
tree fd05a4cd3f3e31c1e2dcd0fb7f5613e2daecca44
parent e759dd8dae254d4e5d0b2f86ffcaca8e764ab069
parent d3fbd5dacf69ef86bd016cf80e88bce384ce961e

Merge "rust: Update to syn-2"

system/gd/rust/gddi/macros/Cargo.toml

diff --git a/system/gd/rust/gddi/macros/Cargo.toml b/system/gd/rust/gddi/macros/Cargo.toml
index 53978f6..fbbdca1 100644
--- a/system/gd/rust/gddi/macros/Cargo.toml
+++ b/system/gd/rust/gddi/macros/Cargo.toml
@@ -21,7 +21,7 @@
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = "1.0"
+syn = "2.0.1"
 
 [lib]
 proc-macro = true

system/gd/rust/gddi/macros/lib.rs

diff --git a/system/gd/rust/gddi/macros/lib.rs b/system/gd/rust/gddi/macros/lib.rs
index ea76138..48d2fe7 100644
--- a/system/gd/rust/gddi/macros/lib.rs
+++ b/system/gd/rust/gddi/macros/lib.rs
@@ -116,12 +116,12 @@
             "providers" => {
                 let entries;
                 braced!(entries in input);
-                Ok(ModuleEntry::Providers(entries.parse_terminated(ProviderDef::parse)?))
+                Ok(ModuleEntry::Providers(entries.parse_terminated(ProviderDef::parse, Token![,])?))
             }
             "submodules" => {
                 let entries;
                 braced!(entries in input);
-                Ok(ModuleEntry::Submodules(entries.parse_terminated(Path::parse)?))
+                Ok(ModuleEntry::Submodules(entries.parse_terminated(Path::parse, Token![,])?))
             }
             keyword => {
                 panic!("unexpected keyword: {}", keyword);
@@ -152,7 +152,7 @@
         #[allow(missing_docs)]
         pub fn #init_ident(builder: gddi::RegistryBuilder) -> gddi::RegistryBuilder {
             // Register all providers on this module
-            let ret = builder#(.register_provider::<#types>(Box::new(#provider_idents)))*
+            let ret = builder #(.register_provider::<#types>(Box::new(#provider_idents)))*
             // Register all submodules on this module
             #(.register_module(#submodule_idents))*;
 
@@ -195,7 +195,7 @@
         #struct_
 
         fn #fn_ident(builder: gddi::RegistryBuilder) -> gddi::RegistryBuilder {
-            builder#(.register_provider::<#field_types>(Box::new(
+            builder #(.register_provider::<#field_types>(Box::new(
                 |registry: std::sync::Arc<gddi::Registry>| -> std::pin::Pin<gddi::ProviderFutureBox> {
                     Box::pin(async move {
                         Box::new(async move {

system/gd/rust/shim/Cargo.toml

diff --git a/system/gd/rust/shim/Cargo.toml b/system/gd/rust/shim/Cargo.toml
index acf88f1..993ab6a 100644
--- a/system/gd/rust/shim/Cargo.toml
+++ b/system/gd/rust/shim/Cargo.toml
@@ -45,7 +45,7 @@
 protoc-rust = "2.0"
 quote = "1.0.8"
 thiserror = "1.0"
-syn = { version = "1.0.58", features = ['default', 'full'] }
+syn = { version = "2.0.1", features = ['default', 'full'] }
 tokio = { version = "1.0", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }
 tokio-stream = "0.1"
 walkdir = "2.2"

tools/pdl/Cargo.toml

diff --git a/tools/pdl/Cargo.toml b/tools/pdl/Cargo.toml
index a74c851..cfb4b64 100644
--- a/tools/pdl/Cargo.toml
+++ b/tools/pdl/Cargo.toml
@@ -18,8 +18,8 @@
 quote = "1.0.21"
 serde_json = "1.0.86"
 argh = "0.1.7"
-syn = "1.0.102"
-prettyplease = "0.1.25"
+syn = "2.0.16"
+prettyplease = "0.2.6"
 
 [dependencies.serde]
 version = "1.0.145"