Skip to content

Commit 5b75729

Browse files
committed
Prefix private features with "__"
1 parent 02ac230 commit 5b75729

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.github/workflows/full-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -305,20 +305,20 @@ jobs:
305305
# If ever moving to ubuntu-latest, need to manually install libtinfo5 for LLVM.
306306

307307
# Uses full+experimental codegen, so that compatibility breakage towards nightly is detected.
308-
# If the experimental part causes problems, consider using only godot/codegen-full.
308+
# If the experimental part causes problems, consider using only godot/__codegen-full.
309309
- name: linux-full
310310
os: ubuntu-20.04
311311
artifact-name: linux-nightly
312312
godot-binary: godot.linuxbsd.editor.dev.x86_64
313-
rust-extra-args: --features godot/codegen-full
313+
rust-extra-args: --features godot/__codegen-full
314314
with-hot-reload: true
315315

316316
# Combines now a lot of features, but should be OK. lazy-function-tables doesn't work with experimental-threads.
317317
- name: linux-double-lazy
318318
os: ubuntu-20.04
319319
artifact-name: linux-double-nightly
320320
godot-binary: godot.linuxbsd.editor.dev.double.x86_64
321-
rust-extra-args: --features godot/api-custom,godot/double-precision,godot/codegen-full,godot/lazy-function-tables
321+
rust-extra-args: --features godot/api-custom,godot/double-precision,godot/__codegen-full,godot/lazy-function-tables
322322

323323
- name: linux-features-experimental
324324
os: ubuntu-20.04

.github/workflows/minimal-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
os: ubuntu-20.04
158158
artifact-name: linux-nightly
159159
godot-binary: godot.linuxbsd.editor.dev.x86_64
160-
rust-extra-args: --features godot/codegen-full
160+
rust-extra-args: --features godot/__codegen-full
161161
with-hot-reload: true
162162

163163
- name: linux-features-experimental

examples/hot-reload/godot/test/run-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cp MainScene.tscn ../MainScene.tscn
2929

3030
# Compile original Rust source.
3131
cargoArgs=""
32-
#cargoArgs="--features godot/debug-log"
32+
#cargoArgs="--features godot/__debug-log"
3333
cargo build -p hot-reload $cargoArgs
3434

3535
# Wait briefly so artifacts are present on file system.

godot/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ homepage = "https://godot-rust.github.io"
1313
documentation = "https://docs.rs/godot/0.1.1"
1414

1515
[features]
16-
default = ["codegen-full"]
1716
custom-godot = ["api-custom"]
1817
double-precision = ["godot-core/double-precision"]
1918
experimental-godot-api = ["godot-core/experimental-godot-api"]
@@ -41,11 +40,12 @@ api-4-2-1 = ["godot-core/api-4-2-1"]
4140
api-4-2-2 = ["godot-core/api-4-2-2"]
4241
# ]]
4342

43+
default = ["__codegen-full"]
4444

4545
# Private features, they are under no stability guarantee
46-
codegen-full = ["godot-core/codegen-full"]
47-
debug-log = ["godot-core/debug-log"]
48-
trace = ["godot-core/trace"]
46+
__codegen-full = ["godot-core/codegen-full"]
47+
__debug-log = ["godot-core/debug-log"]
48+
__trace = ["godot-core/trace"]
4949

5050
[dependencies]
5151
godot-core = { path = "../godot-core", version = "=0.1.1" }

itest/rust/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "itest"
3-
version = "0.1.0"
3+
version = "0.0.0"
44
edition = "2021"
55
rust-version = "1.78"
66
license = "MPL-2.0"
@@ -11,15 +11,15 @@ crate-type = ["cdylib"]
1111

1212
[features]
1313
default = []
14-
codegen-full-experimental = ["godot/codegen-full", "godot/experimental-godot-api"]
14+
codegen-full-experimental = ["godot/__codegen-full", "godot/experimental-godot-api"]
1515
experimental-threads = ["godot/experimental-threads"]
1616
serde = ["dep:serde", "dep:serde_json", "godot/serde"]
1717

1818
# Do not add features here that are 1:1 forwarded to the `godot` crate, unless they are needed by itest itself.
1919
# Instead, compile itest with `--features godot/my-feature`.
2020

2121
[dependencies]
22-
godot = { path = "../../godot", default-features = false, features = ["trace"] }
22+
godot = { path = "../../godot", default-features = false, features = ["__trace"] }
2323
serde = { version = "1", features = ["derive"], optional = true }
2424
serde_json = { version = "1.0", optional = true }
2525

0 commit comments

Comments
 (0)