diff --git a/.github/renovate.json b/.github/renovate.json index 241a2dbf7..2a2b2748a 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -9,6 +9,11 @@ "commitMessagePrefix": "⬆️ ", "commitMessageTopic": "{{depName}}", "lockFileMaintenance": { "enabled": true } + }, + { + "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "automerge": true, + "rebaseWhen": "conflicted" } ] } diff --git a/zbus_macros/src/iface.rs b/zbus_macros/src/iface.rs index 466b421ba..6e86f69e9 100644 --- a/zbus_macros/src/iface.rs +++ b/zbus_macros/src/iface.rs @@ -2,7 +2,7 @@ use proc_macro2::TokenStream; use quote::{format_ident, quote}; use std::collections::BTreeMap; use syn::{ - self, parse_quote, punctuated::Punctuated, spanned::Spanned, AngleBracketedGenericArguments, + parse_quote, punctuated::Punctuated, spanned::Spanned, AngleBracketedGenericArguments, Attribute, AttributeArgs, Error, FnArg, GenericArgument, ImplItem, ImplItemMethod, ItemImpl, Lit::Str, Meta, Meta::NameValue, MetaList, MetaNameValue, NestedMeta, PatType, PathArguments, ReturnType, Signature, Token, Type, TypePath, diff --git a/zbus_macros/src/proxy.rs b/zbus_macros/src/proxy.rs index 6b08e7a62..3a3e3e029 100644 --- a/zbus_macros/src/proxy.rs +++ b/zbus_macros/src/proxy.rs @@ -3,7 +3,7 @@ use proc_macro2::{Literal, Span, TokenStream}; use quote::{format_ident, quote, quote_spanned, ToTokens}; use regex::Regex; use syn::{ - self, fold::Fold, parse_quote, parse_str, spanned::Spanned, AttributeArgs, Error, FnArg, Ident, + fold::Fold, parse_quote, parse_str, spanned::Spanned, AttributeArgs, Error, FnArg, Ident, ItemTrait, Path, ReturnType, TraitItemMethod, }; use zvariant_utils::{case, def_attrs, macros::AttrParse, old_new}; diff --git a/zbus_xmlgen/src/main.rs b/zbus_xmlgen/src/main.rs index 44ee729e4..447183778 100644 --- a/zbus_xmlgen/src/main.rs +++ b/zbus_xmlgen/src/main.rs @@ -4,7 +4,6 @@ use std::{ error::Error, fs::{File, OpenOptions}, io::Write, - result::Result, }; use clap::Parser; diff --git a/zvariant_derive/src/lib.rs b/zvariant_derive/src/lib.rs index 4e57efb5b..73fa623db 100644 --- a/zvariant_derive/src/lib.rs +++ b/zvariant_derive/src/lib.rs @@ -11,7 +11,7 @@ )))] use proc_macro::TokenStream; -use syn::{self, DeriveInput}; +use syn::DeriveInput; mod dict; mod r#type; diff --git a/zvariant_derive/src/type.rs b/zvariant_derive/src/type.rs index eb6f55fe7..a6fcb85c0 100644 --- a/zvariant_derive/src/type.rs +++ b/zvariant_derive/src/type.rs @@ -1,7 +1,7 @@ use proc_macro2::TokenStream; use quote::{quote, ToTokens}; use syn::{ - self, spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Error, Fields, Generics, Ident, + spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Error, Fields, Generics, Ident, }; use crate::utils::*; diff --git a/zvariant_derive/src/value.rs b/zvariant_derive/src/value.rs index b95717c15..dfa8fe0a5 100644 --- a/zvariant_derive/src/value.rs +++ b/zvariant_derive/src/value.rs @@ -1,8 +1,8 @@ use proc_macro2::{Span, TokenStream}; use quote::{quote, ToTokens}; use syn::{ - self, spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Error, Expr, Fields, Generics, - Ident, Lifetime, LifetimeDef, + spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Error, Expr, Fields, Generics, Ident, + Lifetime, LifetimeDef, }; use crate::utils::*;