Skip to content

Commit a2a85e1

Browse files
bors[bot]chitoyuu
andauthored
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]>
2 parents 8dfffb2 + 3b3d88c commit a2a85e1

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

.github/workflows/minimal-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
rust: stable
5353
components: clippy
5454
- name: "Check clippy"
55-
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
55+
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
5656

5757
check-todo:
5858
runs-on: ubuntu-latest

bindings-generator/src/api.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -435,13 +435,13 @@ impl Ty {
435435
Ty::Rid => syn::parse_quote! { Rid },
436436
Ty::VariantArray => syn::parse_quote! { VariantArray },
437437
Ty::Dictionary => syn::parse_quote! { Dictionary },
438-
Ty::ByteArray => syn::parse_quote! { ByteArray },
439-
Ty::StringArray => syn::parse_quote! { StringArray },
440-
Ty::Vector2Array => syn::parse_quote! { Vector2Array },
441-
Ty::Vector3Array => syn::parse_quote! { Vector3Array },
442-
Ty::ColorArray => syn::parse_quote! { ColorArray },
443-
Ty::Int32Array => syn::parse_quote! { Int32Array },
444-
Ty::Float32Array => syn::parse_quote! { Float32Array },
438+
Ty::ByteArray => syn::parse_quote! { PoolArray<u8> },
439+
Ty::StringArray => syn::parse_quote! { PoolArray<GodotString> },
440+
Ty::Vector2Array => syn::parse_quote! { PoolArray<Vector2> },
441+
Ty::Vector3Array => syn::parse_quote! { PoolArray<Vector3> },
442+
Ty::ColorArray => syn::parse_quote! { PoolArray<Color> },
443+
Ty::Int32Array => syn::parse_quote! { PoolArray<i32> },
444+
Ty::Float32Array => syn::parse_quote! { PoolArray<f32> },
445445
Ty::Result => syn::parse_quote! { GodotResult },
446446
Ty::VariantType => syn::parse_quote! { VariantType },
447447
Ty::VariantOperator => syn::parse_quote! { VariantOperator },
@@ -590,7 +590,7 @@ impl Ty {
590590
| Ty::Variant => {
591591
let rust_ty = self.to_rust();
592592
quote! {
593-
#rust_ty::from_sys(ret)
593+
<#rust_ty>::from_sys(ret)
594594
}
595595
}
596596
Ty::Object(ref path) => {

bindings-generator/src/class_docs.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ impl GodotXmlDocs {
153153
"RID" => "Rid",
154154
"AABB" => "Aabb",
155155
"Array" => "VariantArray",
156-
"PoolByteArray" => "ByteArray",
157-
"PoolStringArray" => "StringArray",
158-
"PoolVector2Array" => "Vector2Array",
159-
"PoolVector3Array" => "Vector3Array",
160-
"PoolColorArray" => "ColorArray",
161-
"PoolIntArray" => "Int32Array",
162-
"PoolRealArray" => "Float32Array",
156+
"PoolByteArray" => "PoolArray<u8>",
157+
"PoolStringArray" => "PoolArray<GodotString>",
158+
"PoolVector2Array" => "PoolArray<Vector2>",
159+
"PoolVector3Array" => "PoolArray<Vector3>",
160+
"PoolColorArray" => "PoolArray<Color>",
161+
"PoolIntArray" => "PoolArray<i32>",
162+
"PoolRealArray" => "PoolArray<f32>",
163163
"G6DOFJointAxisParam" => "G6dofJointAxisParam",
164164
"G6DOFJointAxisFlag" => "G6dofJointAxisFlag",
165165
_ => godot_type,

check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ for arg in "${args[@]}"; do
7272
cmds+=("cargo fmt --all -- --check")
7373
;;
7474
clippy)
75-
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")
75+
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")
7676
;;
7777
test)
7878
cmds+=("cargo test --features $features")

0 commit comments

Comments
 (0)