File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -165,6 +165,10 @@ fn run_command(cmd: Command) -> anyhow::Result<()> {
165165            || line. contains ( "error: invalid type: " ) 
166166            || line. contains ( "error: cyclic feature dependency: feature " ) 
167167            || line. contains ( "error: cyclic package dependency: package " ) 
168+             || ( line. contains ( "error: package collision in the lockfile: packages " ) 
169+                 && line. contains ( 
170+                     " are different, but only one can be written to lockfile unambiguously" , 
171+                 ) ) 
168172        { 
169173            broken_deps = true ; 
170174        }  else  if  line. contains ( "error: failed to parse lock file at" ) 
Original file line number Diff line number Diff line change @@ -338,7 +338,7 @@ test_prepare_error_stderr!(
338338    "error: Attempting to resolve a dependency with more than one crate with links=ring-asm" 
339339) ; 
340340
341- test_prepare_unknown_err ! ( 
341+ test_prepare_error_stderr ! ( 
342342    test_lockfile_collision, 
343343    "lockfile-collision" , 
344344    BrokenDependencies , 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments