Skip to content

Commit 9c5bdfd

Browse files
bors[bot]jabcrossKhelthal
authored
Merge #59 #63
59: Call rustfmt directly, as rustup may not be installed. r=Bromeon a=jabcross 63: Remove "scalar-math" feature from glam to fix incompatibilities with other crates r=Bromeon a=Khelthal Removed the "scalar-math" feature from glam. - Closes #62 Co-authored-by: Pedro Ciambra <[email protected]> Co-authored-by: Khelthal <[email protected]>
3 parents 71b9ffd + 9fa4ea5 + 0f4701e commit 9c5bdfd

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

godot-codegen/src/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,8 @@ fn rustfmt_if_needed(out_files: Vec<PathBuf>) {
9696
println!("Format {} generated files...", out_files.len());
9797

9898
for files in out_files.chunks(20) {
99-
let mut process = std::process::Command::new("rustup");
100-
process
101-
.arg("run")
102-
.arg("stable")
103-
.arg("rustfmt")
104-
.arg("--edition=2021");
99+
let mut process = std::process::Command::new("rustfmt");
100+
process.arg("--edition=2021");
105101

106102
println!(" Format {} files...", files.len());
107103
for file in files {

godot-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ godot-ffi = { path = "../godot-ffi" }
1919
once_cell = "1.8"
2020

2121
# See https://docs.rs/glam/latest/glam/index.html#feature-gates
22-
glam = { version = "0.22", features = ["debug-glam-assert", "scalar-math"] }
22+
glam = { version = "0.22", features = ["debug-glam-assert"] }
2323

2424
# Reverse dev dependencies so doctests can use `godot::` prefix
2525
[dev-dependencies]

0 commit comments

Comments
 (0)