From b127a4c8946c5683cb3aada40841e24d761b4af8 Mon Sep 17 00:00:00 2001 From: scott Date: Fri, 1 Apr 2022 15:15:22 -0500 Subject: [PATCH] Fixed bug on `TomlDependncy::Simple` where it would not inherit `optional` or `features` correctly --- src/cargo/util/toml/mod.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index b49bdce51..3db1cf464 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -2196,7 +2196,18 @@ impl TomlDependency

{ label, label )).map(|dep| { match dep { - TomlDependency::Simple(s) => TomlDependency::Simple(s), + TomlDependency::Simple(s) => { + if optional.is_some() || features.is_some() { + TomlDependency::Detailed(DetailedTomlDependency::

{ + version: Some(s), + optional, + features, + ..Default::default() + }) + } else { + TomlDependency::Simple(s) + } + }, TomlDependency::Detailed(d) => { let mut dep = d.clone(); dep.add_features(features);