Skip to content

Commit 246339b

Browse files
committed
Align clippy features between CI jobs; address lifetimes in serde
1 parent 2a93eb0 commit 246339b

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/full-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
env:
1919
# Applies to all 'register-docs' features across crates.
20-
CLIPPY_FEATURES: '--features register-docs'
20+
CLIPPY_FEATURES: '--features register-docs,godot/experimental-godot-api,godot/serde'
2121
TEST_FEATURES: ''
2222
RETRY: ${{ github.workspace }}/.github/other/retry.sh
2323

.github/workflows/minimal-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222

2323
env:
2424
# Applies to all 'register-docs' features across crates.
25-
CLIPPY_FEATURES: '--features register-docs'
25+
CLIPPY_FEATURES: '--features register-docs,godot/experimental-godot-api,godot/serde'
2626
TEST_FEATURES: ''
2727
# GDEXT_CRATE_ARGS: '-p godot-codegen -p godot-ffi -p godot-core -p godot-macros -p godot'
2828
RETRY: ${{ github.workspace }}/.github/other/retry.sh

.github/workflows/release-version.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ on:
1414
- 'v0.[0-9]+.[0-9]+'
1515

1616
env:
17-
# Note: used for test and clippy, not for publish
18-
GDEXT_FEATURES: "--features godot/experimental-godot-api,godot/codegen-rustfmt,godot/serde"
17+
# Note: used for test and clippy, not for publish. Test features are different from other CIs.
18+
CLIPPY_TEST_FEATURES: "--features godot/experimental-godot-api,godot/codegen-rustfmt,godot/serde"
1919

2020
# Crates to publish -- important, this doesn't work when there are spaces in any of the paths!
2121
# Keep in sync with update-version.sh
@@ -108,7 +108,7 @@ jobs:
108108
run: rustup update stable
109109

110110
- name: "Compile and run test"
111-
run: cargo test $GDEXT_FEATURES
111+
run: cargo test $CLIPPY_TEST_FEATURES
112112

113113
clippy:
114114
runs-on: ubuntu-latest
@@ -121,7 +121,7 @@ jobs:
121121

122122
- name: "Check clippy"
123123
run: |
124-
cargo clippy --all-targets $GDEXT_FEATURES -- \
124+
cargo clippy --all-targets $CLIPPY_TEST_FEATURES -- \
125125
-D clippy::suspicious \
126126
-D clippy::style \
127127
-D clippy::complexity \

godot-core/src/builtin/string/gstring.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ mod serialize {
384384
D: Deserializer<'de>,
385385
{
386386
struct GStringVisitor;
387-
impl<'de> Visitor<'de> for GStringVisitor {
387+
impl Visitor<'_> for GStringVisitor {
388388
type Value = GString;
389389

390390
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {

godot-core/src/builtin/string/string_name.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ mod serialize {
421421
D: Deserializer<'de>,
422422
{
423423
struct StringNameVisitor;
424-
impl<'de> Visitor<'de> for StringNameVisitor {
424+
impl Visitor<'_> for StringNameVisitor {
425425
type Value = StringName;
426426

427427
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {

0 commit comments

Comments
 (0)