mirror of
				https://github.com/rust-lang/cargo.git
				synced 2025-11-03 13:12:53 +00:00 
			
		
		
		
	Fixed bug on TomlDependncy::Simple where it would not inherit optional or features correctly
				
					
				
			This commit is contained in:
		
							parent
							
								
									01c06b0360
								
							
						
					
					
						commit
						b127a4c894
					
				@ -2196,7 +2196,18 @@ impl<P: ResolveToPath + Clone> TomlDependency<P> {
 | 
				
			|||||||
                    label, label
 | 
					                    label, label
 | 
				
			||||||
                )).map(|dep| {
 | 
					                )).map(|dep| {
 | 
				
			||||||
                    match dep {
 | 
					                    match dep {
 | 
				
			||||||
                        TomlDependency::Simple(s) => TomlDependency::Simple(s),
 | 
					                        TomlDependency::Simple(s) => {
 | 
				
			||||||
 | 
					                            if optional.is_some() || features.is_some() {
 | 
				
			||||||
 | 
					                                TomlDependency::Detailed(DetailedTomlDependency::<P> {
 | 
				
			||||||
 | 
					                                    version: Some(s),
 | 
				
			||||||
 | 
					                                    optional,
 | 
				
			||||||
 | 
					                                    features,
 | 
				
			||||||
 | 
					                                    ..Default::default()
 | 
				
			||||||
 | 
					                                })
 | 
				
			||||||
 | 
					                            } else {
 | 
				
			||||||
 | 
					                                TomlDependency::Simple(s)
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        },
 | 
				
			||||||
                        TomlDependency::Detailed(d) => {
 | 
					                        TomlDependency::Detailed(d) => {
 | 
				
			||||||
                            let mut dep = d.clone();
 | 
					                            let mut dep = d.clone();
 | 
				
			||||||
                            dep.add_features(features);
 | 
					                            dep.add_features(features);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user