Merge #1008

1008: Removed usage of deprecated aliases in generated code r=chitoyuu a=chitoyuu Also denied all warnings in CI and check.sh Co-authored-by: Chitose Yuuzaki <[email protected]>
godot-rust · Jan 10, 2023 · a2a85e1 · a2a85e1
2 parents 8dfffb2 + 3b3d88c
commit a2a85e1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/minimal-ci.yml b/.github/workflows/minimal-ci.yml
@@ -52,7 +52,7 @@ jobs:
           rust: stable
           components: clippy
       - name: "Check clippy"
-        run: cargo clippy --workspace --features ${GDRUST_FEATURES} -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented
+        run: cargo clippy --workspace --features ${GDRUST_FEATURES} -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented -D warnings
 
   check-todo:
     runs-on: ubuntu-latest

diff --git a/bindings-generator/src/api.rs b/bindings-generator/src/api.rs
@@ -435,13 +435,13 @@ impl Ty {
             Ty::Rid => syn::parse_quote! { Rid },
             Ty::VariantArray => syn::parse_quote! { VariantArray },
             Ty::Dictionary => syn::parse_quote! { Dictionary },
-            Ty::ByteArray => syn::parse_quote! { ByteArray },
-            Ty::StringArray => syn::parse_quote! { StringArray },
-            Ty::Vector2Array => syn::parse_quote! { Vector2Array },
-            Ty::Vector3Array => syn::parse_quote! { Vector3Array },
-            Ty::ColorArray => syn::parse_quote! { ColorArray },
-            Ty::Int32Array => syn::parse_quote! { Int32Array },
-            Ty::Float32Array => syn::parse_quote! { Float32Array },
+            Ty::ByteArray => syn::parse_quote! { PoolArray<u8> },
+            Ty::StringArray => syn::parse_quote! { PoolArray<GodotString> },
+            Ty::Vector2Array => syn::parse_quote! { PoolArray<Vector2> },
+            Ty::Vector3Array => syn::parse_quote! { PoolArray<Vector3> },
+            Ty::ColorArray => syn::parse_quote! { PoolArray<Color> },
+            Ty::Int32Array => syn::parse_quote! { PoolArray<i32> },
+            Ty::Float32Array => syn::parse_quote! { PoolArray<f32> },
             Ty::Result => syn::parse_quote! { GodotResult },
             Ty::VariantType => syn::parse_quote! { VariantType },
             Ty::VariantOperator => syn::parse_quote! { VariantOperator },
@@ -590,7 +590,7 @@ impl Ty {
             | Ty::Variant => {
                 let rust_ty = self.to_rust();
                 quote! {
-                    #rust_ty::from_sys(ret)
+                    <#rust_ty>::from_sys(ret)
                 }
             }
             Ty::Object(ref path) => {

diff --git a/bindings-generator/src/class_docs.rs b/bindings-generator/src/class_docs.rs
@@ -153,13 +153,13 @@ impl GodotXmlDocs {
             "RID" => "Rid",
             "AABB" => "Aabb",
             "Array" => "VariantArray",
-            "PoolByteArray" => "ByteArray",
-            "PoolStringArray" => "StringArray",
-            "PoolVector2Array" => "Vector2Array",
-            "PoolVector3Array" => "Vector3Array",
-            "PoolColorArray" => "ColorArray",
-            "PoolIntArray" => "Int32Array",
-            "PoolRealArray" => "Float32Array",
+            "PoolByteArray" => "PoolArray<u8>",
+            "PoolStringArray" => "PoolArray<GodotString>",
+            "PoolVector2Array" => "PoolArray<Vector2>",
+            "PoolVector3Array" => "PoolArray<Vector3>",
+            "PoolColorArray" => "PoolArray<Color>",
+            "PoolIntArray" => "PoolArray<i32>",
+            "PoolRealArray" => "PoolArray<f32>",
             "G6DOFJointAxisParam" => "G6dofJointAxisParam",
             "G6DOFJointAxisFlag" => "G6dofJointAxisFlag",
             _ => godot_type,

diff --git a/check.sh b/check.sh
@@ -72,7 +72,7 @@ for arg in "${args[@]}"; do
         cmds+=("cargo fmt --all -- --check")
         ;;
     clippy)
-        cmds+=("cargo clippy --workspace --features $features -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented")
+        cmds+=("cargo clippy --workspace --features $features -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented -D warnings")
         ;;
     test)
         cmds+=("cargo test --features $features")