Merge #768

768: Lint/tooling update r=Bromeon a=Bromeon

Updates dependencies, UI tests and lints according to newer rustc and clippy versions
bors try

Co-authored-by: Jan Haller <bromeon@gmail.com>

Author: bors[bot]

.github/workflows/ci.yml

@@ -102,16 +102,16 @@ jobs:
         if: ${{ matrix.is_windows }}
         run: cargo build --target x86_64-pc-windows-msvc --release;
 
-  rustc-1-46:
+  rustc-1-54:
     needs: rustfmt
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f
         with:
-          toolchain: 1.46.0
-      - name: Checking on 1.46.0
-        run: cargo +1.46.0 check --all --all-features;
+          toolchain: 1.54.0
+      - name: Checking on 1.54.0
+        run: cargo +1.54.0 check --all --all-features;
 
   test_ios:
     continue-on-error: ${{ matrix.experimental }}
@@ -271,7 +271,7 @@ jobs:
       - clippy
       - rustfmt
       - test
-      - rustc-1-46
+      - rustc-1-54
       - test_ios
       - test_android
       - godot_test

bindings_generator/Cargo.toml

@@ -14,10 +14,10 @@ edition = "2018"
 debug = []
 
 [dependencies]
-heck = "0.3.0"
-roxmltree = "0.14.0"
-proc-macro2 = "1.0.6"
-quote = "1.0.2"
-syn = { version = "1.0", features = ["full", "extra-traits", "visit"] }
-miniserde = "=0.1.13"
+heck = "0.3.3"
+roxmltree = "0.14.1"
+proc-macro2 = "1.0.28"
+quote = "1.0.9"
+syn = { version = "1.0.74", features = ["full", "extra-traits", "visit"] }
+miniserde = "0.1.14"
 unindent = "0.1.7"

bindings_generator/src/api.rs

@@ -395,17 +395,17 @@ impl Ty {
                 let mut split = ty[5..].split("::");
                 let class_name = split.next().unwrap();
                 let name = format_ident!("{}", split.next().unwrap().to_camel_case());
-                let module = format_ident!("{}", module_name_from_class_name(&class_name));
+                let module = format_ident!("{}", module_name_from_class_name(class_name));
                 // Is it a known type?
-                match Ty::from_src(&class_name) {
+                match Ty::from_src(class_name) {
                     Ty::Enum(_) | Ty::Object(_) => {
                         Ty::Enum(syn::parse_quote! { crate::generated::#module::#name })
                     }
                     _ => Ty::Enum(syn::parse_quote! { #module::#name }),
                 }
             }
             ty => {
-                let module = format_ident!("{}", module_name_from_class_name(&ty));
+                let module = format_ident!("{}", module_name_from_class_name(ty));
                 let ty = format_ident!("{}", ty);
                 Ty::Object(syn::parse_quote! { crate::generated::#module::#ty })
             }

bindings_generator/src/classes.rs

@@ -67,7 +67,7 @@ pub(crate) fn generate_class_constants(class: &GodotClass) -> TokenStream {
 
     let mut class_constants: Vec<(&ConstantName, &ConstantValue)> =
         class.constants.iter().collect();
-    class_constants.sort_by(|a, b| a.0.cmp(&b.0));
+    class_constants.sort_by(|a, b| a.0.cmp(b.0));
 
     for (name, value) in &class_constants {
         let name = format_ident!("{}", name);
@@ -114,7 +114,7 @@ pub(crate) fn generate_enums(class: &GodotClass) -> TokenStream {
         let typ_name = format_ident!("{}", enum_name);
 
         let mut values: Vec<_> = e.values.iter().collect();
-        values.sort_by(|a, b| a.1.cmp(&b.1));
+        values.sort_by(|a, b| a.1.cmp(b.1));
 
         let consts = values.iter().map(|(key, val)| {
             let key = key.to_uppercase();

bindings_generator/src/documentation.rs

@@ -134,7 +134,7 @@ see the type-level documentation on `Ref`.
 
 fn list_base_classes(output: &mut impl Write, api: &Api, parent_name: &str) -> GeneratorResult {
     if let Some(parent) = api.find_class(parent_name) {
-        let class_link = class_doc_link(&parent);
+        let class_link = class_doc_link(parent);
 
         writeln!(output, " - {}", class_link)?;
 

bindings_generator/src/lib.rs

@@ -52,7 +52,7 @@ pub fn generate_bindings(api: &Api, docs: Option<&GodotXmlDocs>) -> BindingResul
         .map(|class| {
             (
                 class.name.clone(),
-                generate_class_bindings(&api, class, &mut icalls, docs),
+                generate_class_bindings(api, class, &mut icalls, docs),
             )
         })
         .collect();
@@ -84,7 +84,7 @@ fn generate_class_bindings(
 ) -> TokenStream {
     // types and methods
     let types_and_methods = {
-        let documentation = generate_class_documentation(&api, class);
+        let documentation = generate_class_documentation(api, class);
 
         let class_struct = generate_class_struct(class);
 
@@ -111,15 +111,15 @@ fn generate_class_bindings(
     let traits = {
         let object_impl = generate_godot_object_impl(class);
 
-        let free_impl = generate_queue_free_impl(&api, class);
+        let free_impl = generate_queue_free_impl(api, class);
 
         let base_class = if !class.base_class.is_empty() {
             generate_deref_impl(class)
         } else {
             Default::default()
         };
 
-        let sub_class = generate_sub_class_impls(&api, class);
+        let sub_class = generate_sub_class_impls(api, class);
 
         // Instantiable
         let instantiable = if class.instantiable {
@@ -146,7 +146,7 @@ fn generate_class_bindings(
 
     // method table for classes with functions
     let method_table = if class.instantiable || !class.methods.is_empty() {
-        generate_method_table(&api, class)
+        generate_method_table(api, class)
     } else {
         Default::default()
     };

bindings_generator/src/methods.rs

@@ -250,7 +250,7 @@ fn rename_property_getter<'a>(name: &'a str, class: &GodotClass) -> &'a str {
     if name.starts_with("get_") && class.is_getter(name) {
         &name[4..]
     } else {
-        &name
+        name
     }
 }
 
@@ -293,7 +293,7 @@ pub(crate) fn generate_methods(
             ..
         } = method.get_name();
 
-        if skip_method(&method, &method_name) {
+        if skip_method(method, method_name) {
             continue;
         }
 
@@ -337,7 +337,7 @@ pub(crate) fn generate_methods(
 
         // Adjust getters to match guideline conventions:
         // https://rust-lang.github.io/api-guidelines/naming.html#getter-names-follow-rust-convention-c-getter
-        let rusty_method_name = rename_property_getter(&method_name, &class);
+        let rusty_method_name = rename_property_getter(method_name, class);
 
         let method_sig = MethodSig::from_method(method);
         let icall_ty = method_sig.icall_type();

bindings_generator/src/special_methods.rs

@@ -79,7 +79,7 @@ pub fn generate_instantiable_impl(class: &GodotClass) -> TokenStream {
 pub fn generate_queue_free_impl(api: &Api, class: &GodotClass) -> TokenStream {
     let class_name = format_ident!("{}", class.name);
 
-    let queue_free_output = if class.name == "Node" || api.class_inherits(&class, "Node") {
+    let queue_free_output = if class.name == "Node" || api.class_inherits(class, "Node") {
         quote! {
             impl QueueFree for #class_name {
                 #[inline]

examples/dodge_the_creeps/Cargo.toml

@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 gdnative = { path = "../../gdnative" }
-rand = "0.8.3"
+rand = "0.8.4"

examples/dodge_the_creeps/src/player.rs

@@ -47,16 +47,16 @@ impl Player {
         let input = Input::godot_singleton();
         let mut velocity = Vector2::new(0.0, 0.0);
 
-        if Input::is_action_pressed(&input, "ui_right") {
+        if Input::is_action_pressed(input, "ui_right") {
             velocity.x += 1.0
         }
-        if Input::is_action_pressed(&input, "ui_left") {
+        if Input::is_action_pressed(input, "ui_left") {
             velocity.x -= 1.0
         }
-        if Input::is_action_pressed(&input, "ui_down") {
+        if Input::is_action_pressed(input, "ui_down") {
             velocity.y += 1.0
         }
-        if Input::is_action_pressed(&input, "ui_up") {
+        if Input::is_action_pressed(input, "ui_up") {
             velocity.y -= 1.0
         }