From 7c280fc1716a98b400da96e28195bdebaad669d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 02:49:37 +0000 Subject: [PATCH] fix(deps): update rust dependencies `syn` breaking changes: * `Method` renamed to `Fn` * `extra-traits` feature necessary for `Debug` impls --- Cargo.lock | 28 ++++++++++++++++++++++++---- core/macros/Cargo.toml | 2 +- core/macros/src/lib.rs | 6 +++--- desktop/Cargo.toml | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23f4e52e3..5dc5b8332 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1129,7 +1129,16 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +dependencies = [ + "dirs-sys 0.4.0", ] [[package]] @@ -1143,6 +1152,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +dependencies = [ + "libc", + "redox_users", + "windows-sys 0.45.0", +] + [[package]] name = "dispatch" version = "0.2.0" @@ -3364,7 +3384,7 @@ dependencies = [ "bytemuck", "clap", "cpal", - "dirs", + "dirs 5.0.0", "embed-resource", "generational-arena", "isahc", @@ -3397,7 +3417,7 @@ name = "ruffle_macros" version = "0.1.0" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.2", ] [[package]] @@ -4639,7 +4659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" dependencies = [ "core-foundation", - "dirs", + "dirs 4.0.0", "jni 0.21.1", "log", "ndk-context", diff --git a/core/macros/Cargo.toml b/core/macros/Cargo.toml index 2c74ae1ab..a8944b2e9 100644 --- a/core/macros/Cargo.toml +++ b/core/macros/Cargo.toml @@ -12,4 +12,4 @@ proc-macro = true [dependencies] quote = "1.0.26" -syn = { version = "1.0.109", features = ["full"] } +syn = { version = "2.0.2", features = ["extra-traits", "full"] } diff --git a/core/macros/src/lib.rs b/core/macros/src/lib.rs index 4999e49db..bffb7622c 100644 --- a/core/macros/src/lib.rs +++ b/core/macros/src/lib.rs @@ -3,7 +3,7 @@ extern crate proc_macro; use proc_macro::TokenStream; use quote::quote; use syn::{ - parse_macro_input, parse_quote, FnArg, ImplItem, ImplItemMethod, ItemEnum, ItemTrait, Pat, + parse_macro_input, parse_quote, FnArg, ImplItem, ImplItemFn, ItemEnum, ItemTrait, Pat, TraitItem, Visibility, }; @@ -64,7 +64,7 @@ pub fn enum_trait_object(args: TokenStream, item: TokenStream) -> TokenStream { .items .iter() .map(|item| match item { - TraitItem::Method(method) => { + TraitItem::Fn(method) => { let method_name = method.sig.ident.clone(); let params: Vec<_> = method .sig @@ -97,7 +97,7 @@ pub fn enum_trait_object(args: TokenStream, item: TokenStream) -> TokenStream { } }); - ImplItem::Method(ImplItemMethod { + ImplItem::Fn(ImplItemFn { attrs: method.attrs.clone(), vis: Visibility::Inherited, defaultness: None, diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index ee6e3cd4b..d0138ec0e 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -21,7 +21,7 @@ winit = "0.28.3" webbrowser = "0.8.8" url = "2.3.1" arboard = "3.2.0" -dirs = "4.0" +dirs = "5.0" isahc = "1.7.2" rfd = "0.11.2" anyhow = "1.0"