From 3375ec9439f84c0b46bef8add9ade1a65d0325dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 10:33:23 -0700
Subject: [PATCH] Bump syn from 1.0.109 to 2.0.3 (#371)

* Bump syn from 1.0.109 to 2.0.3

Bumps [syn](https://github.com/dtolnay/syn) from 1.0.109 to 2.0.3.
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](https://github.com/dtolnay/syn/compare/1.0.109...2.0.3)

---
updated-dependencies:
- dependency-name: syn
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fixes and updates

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam H. Leventhal <ahl@oxide.computer>
---
 Cargo.lock                          | 22 +++++++++++++++++-----
 progenitor-impl/Cargo.toml          |  2 +-
 progenitor-macro/Cargo.toml         |  4 ++--
 progenitor-macro/src/token_utils.rs |  4 ++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e59a42b..98ab270 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -361,7 +361,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "serde_tokenstream",
+ "serde_tokenstream 0.1.7",
  "syn 1.0.109",
 ]
 
@@ -1240,7 +1240,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "syn 1.0.109",
+ "syn 2.0.3",
  "thiserror",
  "typify",
  "unicode-ident",
@@ -1257,9 +1257,9 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "serde_tokenstream",
+ "serde_tokenstream 0.2.0",
  "serde_yaml",
- "syn 1.0.109",
+ "syn 2.0.3",
 ]
 
 [[package]]
@@ -1640,6 +1640,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "serde_tokenstream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a00ffd23fd882d096f09fcaae2a9de8329a328628e86027e049ee051dc1621f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.3",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -2090,7 +2102,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "serde_tokenstream",
+ "serde_tokenstream 0.1.7",
  "syn 1.0.109",
  "typify-impl",
 ]
diff --git a/progenitor-impl/Cargo.toml b/progenitor-impl/Cargo.toml
index d5517b1..014d011 100644
--- a/progenitor-impl/Cargo.toml
+++ b/progenitor-impl/Cargo.toml
@@ -19,7 +19,7 @@ rustfmt-wrapper = "0.2.0"
 schemars = { version = "0.8.12", features = ["chrono", "uuid1"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-syn = { version = "1.0", features = ["parsing"] }
+syn = { version = "2.0", features = ["parsing"] }
 thiserror = "1.0"
 # To publish, use a numbered version
 #typify = "0.0.10"
diff --git a/progenitor-macro/Cargo.toml b/progenitor-macro/Cargo.toml
index f4cade8..813c7a5 100644
--- a/progenitor-macro/Cargo.toml
+++ b/progenitor-macro/Cargo.toml
@@ -19,5 +19,5 @@ schemars = "0.8.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
-serde_tokenstream = "0.1.7"
-syn = "1.0"
+serde_tokenstream = "0.2.0"
+syn = { version = "2.0", features = ["full", "extra-traits"] }
diff --git a/progenitor-macro/src/token_utils.rs b/progenitor-macro/src/token_utils.rs
index 671dd2e..3b5ae38 100644
--- a/progenitor-macro/src/token_utils.rs
+++ b/progenitor-macro/src/token_utils.rs
@@ -6,7 +6,7 @@ use quote::ToTokens;
 use syn::{
     parse::Parse,
     punctuated::Punctuated,
-    token::{Add, Colon},
+    token::{Colon, Plus},
     Ident, Path, Token, TraitBoundModifier,
 };
 
@@ -16,7 +16,7 @@ use progenitor_impl::TypeImpl;
 pub struct TypeAndImpls {
     pub type_name: Path,
     pub colon_token: Option<Colon>,
-    pub impls: Punctuated<ImplTrait, Add>,
+    pub impls: Punctuated<ImplTrait, Plus>,
 }
 
 impl TypeAndImpls {