@@ -1656,7 +1656,17 @@ impl schema::TomlInheritedDependency {
1656
1656
if let Some ( public) = self . public {
1657
1657
d. public = Some ( public) ;
1658
1658
}
1659
- d. add_features ( self . features . clone ( ) ) ;
1659
+ d. features = match ( d. features . clone ( ) , self . features . clone ( ) ) {
1660
+ ( Some ( dep_feat) , Some ( inherit_feat) ) => Some (
1661
+ dep_feat
1662
+ . into_iter ( )
1663
+ . chain ( inherit_feat)
1664
+ . collect :: < Vec < String > > ( ) ,
1665
+ ) ,
1666
+ ( Some ( dep_fet) , None ) => Some ( dep_fet) ,
1667
+ ( None , Some ( inherit_feat) ) => Some ( inherit_feat) ,
1668
+ ( None , None ) => None ,
1669
+ } ;
1660
1670
d. optional = self . optional ;
1661
1671
schema:: TomlDependency :: Detailed ( d)
1662
1672
}
@@ -1712,20 +1722,6 @@ impl<P: ResolveToPath + Clone> schema::TomlDependency<P> {
1712
1722
}
1713
1723
1714
1724
impl schema:: TomlDetailedDependency {
1715
- fn add_features ( & mut self , features : Option < Vec < String > > ) {
1716
- self . features = match ( self . features . clone ( ) , features. clone ( ) ) {
1717
- ( Some ( dep_feat) , Some ( inherit_feat) ) => Some (
1718
- dep_feat
1719
- . into_iter ( )
1720
- . chain ( inherit_feat)
1721
- . collect :: < Vec < String > > ( ) ,
1722
- ) ,
1723
- ( Some ( dep_fet) , None ) => Some ( dep_fet) ,
1724
- ( None , Some ( inherit_feat) ) => Some ( inherit_feat) ,
1725
- ( None , None ) => None ,
1726
- } ;
1727
- }
1728
-
1729
1725
fn resolve_path (
1730
1726
& mut self ,
1731
1727
name : & str ,
0 commit comments