Skip to content

Commit 004e0db

Browse files
committed
Fix clippy warnings
1 parent 065214c commit 004e0db

File tree

14 files changed

+29
-28
lines changed

14 files changed

+29
-28
lines changed

bindings_generator/src/api.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,17 +395,17 @@ impl Ty {
395395
let mut split = ty[5..].split("::");
396396
let class_name = split.next().unwrap();
397397
let name = format_ident!("{}", split.next().unwrap().to_camel_case());
398-
let module = format_ident!("{}", module_name_from_class_name(&class_name));
398+
let module = format_ident!("{}", module_name_from_class_name(class_name));
399399
// Is it a known type?
400-
match Ty::from_src(&class_name) {
400+
match Ty::from_src(class_name) {
401401
Ty::Enum(_) | Ty::Object(_) => {
402402
Ty::Enum(syn::parse_quote! { crate::generated::#module::#name })
403403
}
404404
_ => Ty::Enum(syn::parse_quote! { #module::#name }),
405405
}
406406
}
407407
ty => {
408-
let module = format_ident!("{}", module_name_from_class_name(&ty));
408+
let module = format_ident!("{}", module_name_from_class_name(ty));
409409
let ty = format_ident!("{}", ty);
410410
Ty::Object(syn::parse_quote! { crate::generated::#module::#ty })
411411
}

bindings_generator/src/classes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub(crate) fn generate_class_constants(class: &GodotClass) -> TokenStream {
6767

6868
let mut class_constants: Vec<(&ConstantName, &ConstantValue)> =
6969
class.constants.iter().collect();
70-
class_constants.sort_by(|a, b| a.0.cmp(&b.0));
70+
class_constants.sort_by(|a, b| a.0.cmp(b.0));
7171

7272
for (name, value) in &class_constants {
7373
let name = format_ident!("{}", name);
@@ -114,7 +114,7 @@ pub(crate) fn generate_enums(class: &GodotClass) -> TokenStream {
114114
let typ_name = format_ident!("{}", enum_name);
115115

116116
let mut values: Vec<_> = e.values.iter().collect();
117-
values.sort_by(|a, b| a.1.cmp(&b.1));
117+
values.sort_by(|a, b| a.1.cmp(b.1));
118118

119119
let consts = values.iter().map(|(key, val)| {
120120
let key = key.to_uppercase();

bindings_generator/src/documentation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ see the type-level documentation on `Ref`.
134134

135135
fn list_base_classes(output: &mut impl Write, api: &Api, parent_name: &str) -> GeneratorResult {
136136
if let Some(parent) = api.find_class(parent_name) {
137-
let class_link = class_doc_link(&parent);
137+
let class_link = class_doc_link(parent);
138138

139139
writeln!(output, " - {}", class_link)?;
140140

bindings_generator/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub fn generate_bindings(api: &Api, docs: Option<&GodotXmlDocs>) -> BindingResul
5252
.map(|class| {
5353
(
5454
class.name.clone(),
55-
generate_class_bindings(&api, class, &mut icalls, docs),
55+
generate_class_bindings(api, class, &mut icalls, docs),
5656
)
5757
})
5858
.collect();
@@ -84,7 +84,7 @@ fn generate_class_bindings(
8484
) -> TokenStream {
8585
// types and methods
8686
let types_and_methods = {
87-
let documentation = generate_class_documentation(&api, class);
87+
let documentation = generate_class_documentation(api, class);
8888

8989
let class_struct = generate_class_struct(class);
9090

@@ -111,15 +111,15 @@ fn generate_class_bindings(
111111
let traits = {
112112
let object_impl = generate_godot_object_impl(class);
113113

114-
let free_impl = generate_queue_free_impl(&api, class);
114+
let free_impl = generate_queue_free_impl(api, class);
115115

116116
let base_class = if !class.base_class.is_empty() {
117117
generate_deref_impl(class)
118118
} else {
119119
Default::default()
120120
};
121121

122-
let sub_class = generate_sub_class_impls(&api, class);
122+
let sub_class = generate_sub_class_impls(api, class);
123123

124124
// Instantiable
125125
let instantiable = if class.instantiable {
@@ -146,7 +146,7 @@ fn generate_class_bindings(
146146

147147
// method table for classes with functions
148148
let method_table = if class.instantiable || !class.methods.is_empty() {
149-
generate_method_table(&api, class)
149+
generate_method_table(api, class)
150150
} else {
151151
Default::default()
152152
};

bindings_generator/src/methods.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ fn rename_property_getter<'a>(name: &'a str, class: &GodotClass) -> &'a str {
250250
if name.starts_with("get_") && class.is_getter(name) {
251251
&name[4..]
252252
} else {
253-
&name
253+
name
254254
}
255255
}
256256

@@ -293,7 +293,7 @@ pub(crate) fn generate_methods(
293293
..
294294
} = method.get_name();
295295

296-
if skip_method(&method, &method_name) {
296+
if skip_method(method, method_name) {
297297
continue;
298298
}
299299

@@ -337,7 +337,7 @@ pub(crate) fn generate_methods(
337337

338338
// Adjust getters to match guideline conventions:
339339
// https://rust-lang.github.io/api-guidelines/naming.html#getter-names-follow-rust-convention-c-getter
340-
let rusty_method_name = rename_property_getter(&method_name, &class);
340+
let rusty_method_name = rename_property_getter(method_name, class);
341341

342342
let method_sig = MethodSig::from_method(method);
343343
let icall_ty = method_sig.icall_type();

bindings_generator/src/special_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub fn generate_instantiable_impl(class: &GodotClass) -> TokenStream {
7979
pub fn generate_queue_free_impl(api: &Api, class: &GodotClass) -> TokenStream {
8080
let class_name = format_ident!("{}", class.name);
8181

82-
let queue_free_output = if class.name == "Node" || api.class_inherits(&class, "Node") {
82+
let queue_free_output = if class.name == "Node" || api.class_inherits(class, "Node") {
8383
quote! {
8484
impl QueueFree for #class_name {
8585
#[inline]

examples/dodge_the_creeps/src/player.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ impl Player {
4747
let input = Input::godot_singleton();
4848
let mut velocity = Vector2::new(0.0, 0.0);
4949

50-
if Input::is_action_pressed(&input, "ui_right") {
50+
if Input::is_action_pressed(input, "ui_right") {
5151
velocity.x += 1.0
5252
}
53-
if Input::is_action_pressed(&input, "ui_left") {
53+
if Input::is_action_pressed(input, "ui_left") {
5454
velocity.x -= 1.0
5555
}
56-
if Input::is_action_pressed(&input, "ui_down") {
56+
if Input::is_action_pressed(input, "ui_down") {
5757
velocity.y += 1.0
5858
}
59-
if Input::is_action_pressed(&input, "ui_up") {
59+
if Input::is_action_pressed(input, "ui_up") {
6060
velocity.y -= 1.0
6161
}
6262

gdnative-bindings/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn generate(
6060
}}
6161
pub use crate::generated::{mod_name}::{class_name};
6262
"#,
63-
mod_name = module_name_from_class_name(&class_name),
63+
mod_name = module_name_from_class_name(class_name),
6464
class_name = class_name,
6565
content = code,
6666
)
@@ -77,7 +77,7 @@ fn generate(
7777
binding_res: &BindingResult,
7878
) {
7979
for (class_name, code) in &binding_res.class_bindings {
80-
let mod_name = module_name_from_class_name(&class_name);
80+
let mod_name = module_name_from_class_name(class_name);
8181

8282
let mod_path = out_path.join(format!("{}.rs", mod_name));
8383
let mut mod_output = BufWriter::new(File::create(&mod_path).unwrap());

gdnative-core/src/core_types/node_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ where
137137
{
138138
#[inline]
139139
fn from(s: S) -> NodePath {
140-
NodePath::from_str(&s.as_ref())
140+
NodePath::from_str(s.as_ref())
141141
}
142142
}
143143

gdnative-core/src/core_types/quat.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ impl Quat {
2424
}
2525

2626
#[inline]
27+
#[allow(unused)]
2728
fn glam(self) -> glam::Quat {
2829
glam::Quat::from_xyzw(self.x, self.y, self.z, self.w)
2930
}

0 commit comments

Comments
 (0)