From 26341f3fc0e05d89fd332d77be1783f9cf4b5f19 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Mon, 1 Apr 2024 15:57:34 +0200 Subject: [PATCH] Fix nightly clippy warnings --- src/analysis/enums.rs | 7 +++++-- src/analysis/flags.rs | 7 +++++-- src/analysis/function_parameters.rs | 2 +- src/analysis/functions.rs | 6 ++++-- src/analysis/info_base.rs | 2 +- src/analysis/object.rs | 5 +++-- src/analysis/record.rs | 10 +++++----- src/analysis/rust_type.rs | 2 +- src/chunk/conversion_from_glib.rs | 3 --- src/codegen/doc/mod.rs | 4 ---- src/codegen/function_body_chunk.rs | 4 ++-- src/codegen/return_value.rs | 2 +- src/codegen/sys/cargo_toml.rs | 2 +- src/library.rs | 1 - src/library_postprocessing.rs | 2 +- src/traits.rs | 4 ---- src/xmlparser.rs | 1 - 17 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/analysis/enums.rs b/src/analysis/enums.rs index eff7dd4bc..ac20e9d03 100644 --- a/src/analysis/enums.rs +++ b/src/analysis/enums.rs @@ -1,6 +1,9 @@ use log::info; -use super::{function_parameters::TransformationType, imports::Imports, *}; +use super::{ + function_parameters::TransformationType, functions, imports::Imports, library, + special_functions, +}; use crate::{codegen::Visibility, config::gobjects::GObject, env::Env, nameutil::*, traits::*}; #[derive(Debug, Default)] @@ -87,7 +90,7 @@ pub fn new(env: &Env, obj: &GObject, imports: &mut Imports) -> Option { .unwrap(); if let TransformationType::ToGlibScalar { name, .. } = &mut t.transformation_type { - *name = "self".to_owned(); + "self".clone_into(name); } else { panic!( "Enumeration function instance param must be passed as scalar, not {:?}", diff --git a/src/analysis/flags.rs b/src/analysis/flags.rs index b238d7020..d67327a26 100644 --- a/src/analysis/flags.rs +++ b/src/analysis/flags.rs @@ -1,6 +1,9 @@ use log::info; -use super::{function_parameters::TransformationType, imports::Imports, *}; +use super::{ + function_parameters::TransformationType, functions, imports::Imports, library, + special_functions, +}; use crate::{codegen::Visibility, config::gobjects::GObject, env::Env, nameutil::*, traits::*}; #[derive(Debug, Default)] @@ -83,7 +86,7 @@ pub fn new(env: &Env, obj: &GObject, imports: &mut Imports) -> Option { .unwrap(); if let TransformationType::ToGlibScalar { name, .. } = &mut t.transformation_type { - *name = "self".to_owned(); + "self".clone_into(name); } else { panic!( "Bitfield function instance param must be passed as scalar, not {:?}", diff --git a/src/analysis/function_parameters.rs b/src/analysis/function_parameters.rs index 88fcc1397..d97509506 100644 --- a/src/analysis/function_parameters.rs +++ b/src/analysis/function_parameters.rs @@ -128,7 +128,7 @@ impl TransformationType { pub fn set_to_glib_extra(&mut self, to_glib_extra_: &str) { if let Self::ToGlibPointer { to_glib_extra, .. } = self { - *to_glib_extra = to_glib_extra_.to_owned(); + to_glib_extra_.clone_into(to_glib_extra); } } } diff --git a/src/analysis/functions.rs b/src/analysis/functions.rs index 8b201e044..c8ed4e1a7 100644 --- a/src/analysis/functions.rs +++ b/src/analysis/functions.rs @@ -307,7 +307,7 @@ fn find_callback_bound_to_destructor( for call in callbacks { if call.destroy_index == destroy_index { destroy.nullable = call.nullable; - destroy.bound_name = call.bound_name.clone(); + destroy.bound_name.clone_from(&call.bound_name); return true; } } @@ -512,7 +512,9 @@ fn analyze_callbacks( for (pos, typ) in to_replace { let ty = env.library.type_(typ); params[pos].typ = typ; - params[pos].c_type = ty.get_glib_name().unwrap().to_owned(); + ty.get_glib_name() + .unwrap() + .clone_into(&mut params[pos].c_type); } let mut s = to_remove .iter() diff --git a/src/analysis/info_base.rs b/src/analysis/info_base.rs index fdece4b1f..b3b4423e4 100644 --- a/src/analysis/info_base.rs +++ b/src/analysis/info_base.rs @@ -1,4 +1,4 @@ -use super::{imports::Imports, *}; +use super::{functions, imports::Imports, special_functions}; use crate::{codegen::Visibility, library, version::Version}; #[derive(Debug, Default)] diff --git a/src/analysis/object.rs b/src/analysis/object.rs index 1a414433a..3847526db 100644 --- a/src/analysis/object.rs +++ b/src/analysis/object.rs @@ -3,8 +3,9 @@ use std::{borrow::Cow, ops::Deref}; use log::info; use super::{ - child_properties::ChildProperties, imports::Imports, info_base::InfoBase, - signatures::Signatures, *, + child_properties, child_properties::ChildProperties, class_builder, functions, general, + imports::Imports, info_base::InfoBase, properties, signals, signatures::Signatures, + special_functions, supertypes, Type, TypeId, }; use crate::{ config::gobjects::{GObject, GStatus}, diff --git a/src/analysis/record.rs b/src/analysis/record.rs index a673d1757..e420430a8 100644 --- a/src/analysis/record.rs +++ b/src/analysis/record.rs @@ -1,8 +1,8 @@ use std::ops::Deref; -use log::info; - -use super::{imports::Imports, info_base::InfoBase, record_type::RecordType, *}; +use super::{ + functions, imports::Imports, info_base::InfoBase, record_type::RecordType, special_functions, +}; use crate::{ config::{ derives::{Derive, Derives}, @@ -70,7 +70,7 @@ fn filter_derives(derives: &[Derive], names: &[&str]) -> Derives { } pub fn new(env: &Env, obj: &GObject) -> Option { - info!("Analyzing record {}", obj.name); + log::info!("Analyzing record {}", obj.name); let full_name = obj.name.clone(); let record_tid = env.library.find_type(0, &full_name)?; @@ -191,7 +191,7 @@ pub fn new(env: &Env, obj: &GObject) -> Option { "Have to use get_type function for {full_name} but version is higher than for the type ({get_type_version:?} > {version:?})" ); } else { - error!("Missing memory management functions for {}", full_name); + log::error!("Missing memory management functions for {}", full_name); } } diff --git a/src/analysis/rust_type.rs b/src/analysis/rust_type.rs index 142076845..b67529936 100644 --- a/src/analysis/rust_type.rs +++ b/src/analysis/rust_type.rs @@ -242,7 +242,7 @@ impl<'env> RustTypeBuilder<'env> { mut self, callback_parameters_config: &[CallbackParameter], ) -> Self { - self.callback_parameters_config = callback_parameters_config.to_owned(); + callback_parameters_config.clone_into(&mut self.callback_parameters_config); self } diff --git a/src/chunk/conversion_from_glib.rs b/src/chunk/conversion_from_glib.rs index 986ae8b4c..394fb82c6 100644 --- a/src/chunk/conversion_from_glib.rs +++ b/src/chunk/conversion_from_glib.rs @@ -8,7 +8,6 @@ use crate::{ pub struct Mode { pub typ: library::TypeId, pub transfer: library::Transfer, - pub is_uninitialized: bool, pub try_from_glib: TryFromGlib, } @@ -17,7 +16,6 @@ impl From<¶meter_ffi_call_out::Parameter> for Mode { Mode { typ: orig.typ, transfer: orig.transfer, - is_uninitialized: orig.is_uninitialized, try_from_glib: orig.try_from_glib.clone(), } } @@ -28,7 +26,6 @@ impl From<&analysis::Parameter> for Mode { Mode { typ: orig.lib_par.typ, transfer: orig.lib_par.transfer, - is_uninitialized: false, try_from_glib: orig.try_from_glib.clone(), } } diff --git a/src/codegen/doc/mod.rs b/src/codegen/doc/mod.rs index 71ce26919..fd0cfd964 100644 --- a/src/codegen/doc/mod.rs +++ b/src/codegen/doc/mod.rs @@ -63,7 +63,6 @@ trait FunctionLikeType { fn doc_deprecated(&self) -> &Option; fn ret(&self) -> &Parameter; fn parameters(&self) -> &[Parameter]; - fn version(&self) -> &Option; fn deprecated_version(&self) -> &Option; } @@ -82,9 +81,6 @@ macro_rules! impl_function_like_type { fn parameters(&self) -> &[Parameter] { &self.parameters } - fn version(&self) -> &Option { - &self.version - } fn deprecated_version(&self) -> &Option { &self.deprecated_version } diff --git a/src/codegen/function_body_chunk.rs b/src/codegen/function_body_chunk.rs index 3b2e74809..d9182e3cf 100644 --- a/src/codegen/function_body_chunk.rs +++ b/src/codegen/function_body_chunk.rs @@ -124,7 +124,7 @@ impl Builder { } pub fn transformations(&mut self, transformations: &[Transformation]) -> &mut Self { - self.transformations = transformations.to_owned(); + transformations.clone_into(&mut self.transformations); self } @@ -151,7 +151,7 @@ impl Builder { if !self.callbacks.is_empty() || !self.destroys.is_empty() { for (pos, callback) in self.callbacks.iter().enumerate() { let user_data_index = callback.user_data_index; - if group_by_user_data.get(&user_data_index).is_some() { + if group_by_user_data.contains_key(&user_data_index) { continue; } let calls = self diff --git a/src/codegen/return_value.rs b/src/codegen/return_value.rs index 42f1112ee..c5912e97a 100644 --- a/src/codegen/return_value.rs +++ b/src/codegen/return_value.rs @@ -38,7 +38,7 @@ impl ToReturnValue for library::Parameter { && self.direction == library::ParameterDirection::Return && is_gstring(&name) { - name = "String".to_owned(); + "String".clone_into(&mut name); } let type_str = match ConversionType::of(env, self.typ) { ConversionType::Unknown => format!("/*Unknown conversion*/{name}"), diff --git a/src/codegen/sys/cargo_toml.rs b/src/codegen/sys/cargo_toml.rs index 894e12b68..54e628fcf 100644 --- a/src/codegen/sys/cargo_toml.rs +++ b/src/codegen/sys/cargo_toml.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, fs::File, io::prelude::*}; use log::info; -use toml::{self, value::Table, Value}; +use toml::{value::Table, Value}; use super::collect_versions; use crate::{config::Config, env::Env, file_saver::save_to_file, nameutil, version::Version}; diff --git a/src/library.rs b/src/library.rs index 63d24d3bd..148be21ef 100644 --- a/src/library.rs +++ b/src/library.rs @@ -2,7 +2,6 @@ use std::{ cmp::{Ord, Ordering, PartialOrd}, collections::{BTreeMap, BTreeSet, HashMap, HashSet}, fmt, - iter::Iterator, ops::{Deref, DerefMut}, str::FromStr, }; diff --git a/src/library_postprocessing.rs b/src/library_postprocessing.rs index 11747c6f5..efe083e9e 100644 --- a/src/library_postprocessing.rs +++ b/src/library_postprocessing.rs @@ -88,7 +88,7 @@ impl Library { return; } if let Some(s) = c_types.get(&tid) { - *c_type = s.clone(); + c_type.clone_from(s); } } diff --git a/src/traits.rs b/src/traits.rs index 176f1329d..475ba62c7 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -1,9 +1,5 @@ pub use crate::config::{matchable::Matchable, parameter_matchable::ParameterMatchable}; -pub trait AsStr { - fn as_str(&self) -> &str; -} - pub trait IntoString { fn into_string(self) -> String; } diff --git a/src/xmlparser.rs b/src/xmlparser.rs index 911c47cf4..1d1803a89 100644 --- a/src/xmlparser.rs +++ b/src/xmlparser.rs @@ -8,7 +8,6 @@ use std::{ }; use xml::{ - self, attribute::OwnedAttribute, common::{Position, TextPosition}, name::OwnedName,