Merge #921

921: GitHub Action updates r=Bromeon a=Bromeon

bors r+

Co-authored-by: Jan Haller <[email protected]>

Author: bors[bot]

.github/composite/godot/action.yml

@@ -20,14 +20,14 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install Rust
       uses: ./.github/composite/rust
       with:
         rust: ${{ inputs.rust_toolchain }}
     - name: "Check cache for installed Godot version"
       id: "cache-godot"
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ runner.temp }}/godot_bin
         key: godot-${{ runner.os }}-v${{ inputs.godot_ver }}

.github/composite/llvm/action.yml

@@ -14,7 +14,7 @@ runs:
       id: cache-llvm
       # Note: conditionals not yet supported; see https://github.com/actions/runner/issues/834
       # if: ${{ inputs.llvm == 'true' }}
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ runner.temp }}/llvm
         key: llvm-10.0

.github/composite/rust/action.yml

@@ -27,6 +27,6 @@ runs:
         components: ${{ inputs.components }}
 
     # For notes about the cache, see 'Full CI' workflow
-    - uses: Swatinem/rust-cache@v1
+    - uses: Swatinem/rust-cache@v2
       with:
-        sharedKey: ${{ inputs.cache-key }}
+        shared-key: ${{ inputs.cache-key }}

.github/workflows/doc.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Install Rust"
         uses: ./.github/composite/rust

.github/workflows/full-ci.yml

@@ -51,7 +51,7 @@ jobs:
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         with:
@@ -72,7 +72,7 @@ jobs:
           - toolchain: nightly
             postfix: ' (nightly)'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         with:
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: rustfmt
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Deny
       # Note: manually downloading is ~30s faster than https://github.com/EmbarkStudios/cargo-deny-action
@@ -141,7 +141,7 @@ jobs:
             rust: { toolchain: 'stable', postfix: ' (minimal-deps)', special: 'minimal-deps' }
     runs-on: ${{ matrix.os.id }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install nightly Rust (minimal-deps only)"
         uses: actions-rs/toolchain@v1
         with:
@@ -181,7 +181,7 @@ jobs:
             name: linux
     runs-on: ${{ matrix.os.id }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         with:
@@ -200,7 +200,7 @@ jobs:
     #    rust: [stable]
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         #with:
@@ -232,7 +232,7 @@ jobs:
     #    rust: [stable]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         #with:
@@ -286,7 +286,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Run Godot integration test"
         uses: ./.github/composite/godot
         with:

.github/workflows/minimal-ci.yml

@@ -35,7 +35,7 @@ jobs:
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         with:
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
         with:
@@ -60,7 +60,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Install Rust"
         uses: ./.github/composite/rust
       - name: "Compile tests"
@@ -71,7 +71,7 @@ jobs:
   integration-test-godot:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Run Godot integration test"
         uses: ./.github/composite/godot
         with:

.github/workflows/release-version.yml

@@ -30,7 +30,7 @@ jobs:
   validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # sed: https://unix.stackexchange.com/a/589584
       - name: "Interpret tag version"
@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: validation
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: validation
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -102,7 +102,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: validation
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -119,7 +119,7 @@ jobs:
     steps:
       # Note: we cannot dry-run the publishing, since crates depend on each other, and dry-run will fail if they aren't yet on crates.io.
       # Sleep to leave crates.io and docs.rs some time to index the dependencies, before releasing dependents.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: "Execute crates.io publishing"
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_TOKEN }}

gdnative-core/src/export/macros.rs

@@ -1,16 +1,5 @@
 #![macro_use]
 
-#[doc(hidden)]
-#[macro_export]
-macro_rules! godot_wrap_method_parameter_count {
-    () => {
-        0
-    };
-    ($name:ident, $($other:ident,)*) => {
-        1 + $crate::godot_wrap_method_parameter_count!($($other,)*)
-    }
-}
-
 #[doc(hidden)]
 #[macro_export]
 macro_rules! godot_wrap_method_if_deref {