From 3c0d5603b26041d20bbae5b68e7f6ba46a8a601b Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Mon, 19 Feb 2024 13:12:24 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A4=96=20Renovate=20to=20automerge=20?= =?UTF-8?q?non-major=20updates=20to=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 241a2dbf7..4e65744d6 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -9,6 +9,10 @@ "commitMessagePrefix": "⬆️ ", "commitMessageTopic": "{{depName}}", "lockFileMaintenance": { "enabled": true } + }, + { + "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "automerge": true } ] } From 2f1ac1be0b138e9b6a115896e1043aa993aa8c30 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Mon, 19 Feb 2024 13:19:28 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96=20renovate:=20Only=20update=20?= =?UTF-8?q?branch=20in=20case=20of=20conflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renovate defaults to `behind-base-branch` strategy if automerge is enabled (which we do now for non-major update). We don't need unnecessary rebasing when there are no conflicts. --- .github/renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 4e65744d6..2a2b2748a 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -12,7 +12,8 @@ }, { "matchUpdateTypes": ["minor", "patch", "pin", "digest"], - "automerge": true + "automerge": true, + "rebaseWhen": "conflicted" } ] } From bd0738c7eb31f683da99b6a3bed663c4caee7e5f Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Mon, 19 Feb 2024 13:27:10 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A5=20zd,zm,zx:=20Remove=20redunda?= =?UTF-8?q?nt=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise clippy complains about it: ```rust error: the item `syn` is imported redundantly --> zvariant_derive/src/lib.rs:14:11 | 14 | use syn::{self, DeriveInput}; | ^^^^ the item `syn` is already defined here | = note: `-D unused-imports` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(unused_imports)]` error: the item `syn` is imported redundantly --> zvariant_derive/src/type.rs:4:5 | 4 | self, spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Error, Fields, Generics, Ident, | ^^^^ the item `syn` is already defined here error: the item `syn` is imported redundantly --> zvariant_derive/src/value.rs:4:5 | 4 | self, spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Error, Expr, Fields, Generics, | ^^^^ the item `syn` is already defined here Compiling aho-corasick v1.1.2 Compiling memoffset v0.9.0 Checking utf8parse v0.2.1 error: could not compile `zvariant_derive` (lib) due to 3 previous errors warning: build failed, waiting for other jobs to finish... Error: Process completed with exit code 101. ``` --- zbus_macros/src/iface.rs | 2 +- zbus_macros/src/proxy.rs | 2 +- zbus_xmlgen/src/main.rs | 1 - zvariant_derive/src/lib.rs | 2 +- zvariant_derive/src/type.rs | 2 +- zvariant_derive/src/value.rs | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) 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::*;