Skip to content

Commit d9e3424

Browse files
committed
fix(toml): Prevent more build.rs fields in Cargo scripts
1 parent fa910e3 commit d9e3424

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/cargo/util/toml/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,8 +1391,8 @@ pub fn to_real_manifest(
13911391
dependencies: _,
13921392
dev_dependencies: _,
13931393
dev_dependencies2: _,
1394-
build_dependencies: _,
1395-
build_dependencies2: _,
1394+
build_dependencies,
1395+
build_dependencies2,
13961396
target: _,
13971397
lints: _,
13981398
hints: _,
@@ -1409,6 +1409,8 @@ pub fn to_real_manifest(
14091409
("`example`", example.is_some()),
14101410
("`test`", test.is_some()),
14111411
("`bench`", bench.is_some()),
1412+
("`build-dependencies`", build_dependencies.is_some()),
1413+
("`build_dependencies`", build_dependencies2.is_some()),
14121414
];
14131415
if let Some(package) = original_toml.package() {
14141416
let manifest::TomlPackage {
@@ -1418,7 +1420,7 @@ pub fn to_real_manifest(
14181420
version: _,
14191421
authors: _,
14201422
build,
1421-
metabuild: _,
1423+
metabuild,
14221424
default_target: _,
14231425
forced_target: _,
14241426
links,
@@ -1449,6 +1451,7 @@ pub fn to_real_manifest(
14491451
invalid_fields.extend([
14501452
("`package.workspace`", workspace.is_some()),
14511453
("`package.build`", build.is_some()),
1454+
("`package.metabuild`", metabuild.is_some()),
14521455
("`package.links`", links.is_some()),
14531456
("`package.autolib`", autolib.is_some()),
14541457
("`package.autobins`", autobins.is_some()),

tests/testsuite/cargo_remove/script/in/cargo-remove-test-fixture.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
edition = "2015"
33

4-
[build-dependencies]
5-
semver = "0.1.0"
6-
74
[dependencies]
85
docopt = "0.6"
96
rustc-serialize = "0.4"

tests/testsuite/cargo_remove/script/out/cargo-remove-test-fixture.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
edition = "2015"
33

4-
[build-dependencies]
5-
semver = "0.1.0"
6-
74
[dependencies]
85
rustc-serialize = "0.4"
96
semver = "0.1"

0 commit comments

Comments
 (0)