From f74f38a4f764fd017812ff351906b64cbb239767 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 08:03:49 +0100
Subject: Update syn requirement from 1.0.107 to 2.0.48 (#881)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update syn requirement from 1.0.107 to 2.0.48

Updates the requirements on [syn](https://github.com/dtolnay/syn) to permit the latest version.
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](https://github.com/dtolnay/syn/compare/1.0.107...2.0.48)

---
updated-dependencies:
- dependency-name: syn
  dependency-type: direct:production
...

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

* rtic-macros: attr.path -> attr.path()

* rtic-macros: tokens -> parse_args()

Fix parsing of InitArgs, IdleArgs, *Args

Including HardwareTaskArgs, SoftwareTaskArgs

* rtic-macros: Rename content to input

As syn2 removes the surrounding parenthesis as
part of parse_args() the distinction between
input and content is redundant

* rtic-macros: Handle removal of Expr::Type

Manually parse local_resources

With type ascription de-RFCd syn2 dropped
Expr::Type

* rtic-macros: Syn upgrade CHANGELOG

* rtic-macro: Retain most old errors as they were

Spans are not equal, but good enough

* rtic-macros: syn2 changed some error messages

Additionally some spans were not retained
with the manual parsing workaround

* rtic-macros: clippy fixes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
---
 rtic-macros/src/syntax/parse/app.rs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'rtic-macros/src/syntax/parse/app.rs')

diff --git a/rtic-macros/src/syntax/parse/app.rs b/rtic-macros/src/syntax/parse/app.rs
index d75c8c6..efcafbe 100644
--- a/rtic-macros/src/syntax/parse/app.rs
+++ b/rtic-macros/src/syntax/parse/app.rs
@@ -198,7 +198,9 @@ impl App {
                         .iter()
                         .position(|attr| util::attr_eq(attr, "init"))
                     {
-                        let args = InitArgs::parse(item.attrs.remove(pos).tokens)?;
+                        let args = InitArgs::parse(
+                            item.attrs.remove(pos).parse_args().unwrap_or_default(),
+                        )?;
 
                         // If an init function already exists, error
                         if init.is_some() {
@@ -216,7 +218,9 @@ impl App {
                         .iter()
                         .position(|attr| util::attr_eq(attr, "idle"))
                     {
-                        let args = IdleArgs::parse(item.attrs.remove(pos).tokens)?;
+                        let args = IdleArgs::parse(
+                            item.attrs.remove(pos).parse_args().unwrap_or_default(),
+                        )?;
 
                         // If an idle function already exists, error
                         if idle.is_some() {
@@ -243,7 +247,9 @@ impl App {
                             ));
                         }
 
-                        match syntax_parse::task_args(item.attrs.remove(pos).tokens)? {
+                        match syntax_parse::task_args(
+                            item.attrs.remove(pos).parse_args().unwrap_or_default(),
+                        )? {
                             Either::Left(args) => {
                                 check_binding(&args.binds)?;
                                 check_ident(&item.sig.ident)?;
@@ -369,8 +375,9 @@ impl App {
                                 .iter()
                                 .position(|attr| util::attr_eq(attr, "init"))
                             {
-                                let args = InitArgs::parse(item.attrs.remove(pos).tokens)?;
-
+                                let args = InitArgs::parse(
+                                    item.attrs.remove(pos).parse_args().unwrap_or_default(),
+                                )?;
                                 // If an init function already exists, error
                                 if init.is_some() {
                                     return Err(parse::Error::new(
@@ -387,7 +394,9 @@ impl App {
                                 .iter()
                                 .position(|attr| util::attr_eq(attr, "idle"))
                             {
-                                let args = IdleArgs::parse(item.attrs.remove(pos).tokens)?;
+                                let args = IdleArgs::parse(
+                                    item.attrs.remove(pos).parse_args().unwrap_or_default(),
+                                )?;
 
                                 // If an idle function already exists, error
                                 if idle.is_some() {
@@ -421,7 +430,9 @@ impl App {
                                     ));
                                 }
 
-                                match syntax_parse::task_args(item.attrs.remove(pos).tokens)? {
+                                match syntax_parse::task_args(
+                                    item.attrs.remove(pos).parse_args().unwrap_or_default(),
+                                )? {
                                     Either::Left(args) => {
                                         check_binding(&args.binds)?;
                                         check_ident(&item.sig.ident)?;
-- 
cgit v1.2.3