|
18 | 18 | use crate::{write_file_if_changed, CargoCommandVersioned, OFFLINE}; |
19 | 19 |
|
20 | 20 | use build_helper::rerun_if_changed; |
21 | | -use cargo_metadata::{CargoOpt, Metadata, MetadataCommand}; |
| 21 | +use cargo_metadata::{DependencyKind, Metadata, MetadataCommand}; |
22 | 22 | use parity_wasm::elements::{deserialize_buffer, Module}; |
23 | 23 | use std::{ |
24 | 24 | borrow::ToOwned, |
@@ -89,8 +89,7 @@ fn crate_metadata(cargo_manifest: &Path) -> Metadata { |
89 | 89 | cargo_manifest.to_path_buf() |
90 | 90 | }; |
91 | 91 |
|
92 | | - let mut crate_metadata_command = create_metadata_command(cargo_manifest); |
93 | | - crate_metadata_command.features(CargoOpt::AllFeatures); |
| 92 | + let crate_metadata_command = create_metadata_command(cargo_manifest); |
94 | 93 |
|
95 | 94 | let crate_metadata = crate_metadata_command |
96 | 95 | .exec() |
@@ -915,6 +914,11 @@ fn generate_rerun_if_changed_instructions( |
915 | 914 | packages.insert(DeduplicatePackage::from(package)); |
916 | 915 |
|
917 | 916 | while let Some(dependency) = dependencies.pop() { |
| 917 | + // Ignore all dev dependencies |
| 918 | + if dependency.kind == DependencyKind::Development { |
| 919 | + continue; |
| 920 | + } |
| 921 | + |
918 | 922 | let path_or_git_dep = |
919 | 923 | dependency.source.as_ref().map(|s| s.starts_with("git+")).unwrap_or(true); |
920 | 924 |
|
@@ -967,9 +971,7 @@ fn package_rerun_if_changed(package: &DeduplicatePackage) { |
967 | 971 | p.path() == manifest_path || !p.path().is_dir() || !p.path().join("Cargo.toml").exists() |
968 | 972 | }) |
969 | 973 | .filter_map(|p| p.ok().map(|p| p.into_path())) |
970 | | - .filter(|p| { |
971 | | - p.is_dir() || p.extension().map(|e| e == "rs" || e == "toml").unwrap_or_default() |
972 | | - }) |
| 974 | + .filter(|p| p.extension().map(|e| e == "rs" || e == "toml").unwrap_or_default()) |
973 | 975 | .for_each(rerun_if_changed); |
974 | 976 | } |
975 | 977 |
|
|
0 commit comments