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 @@ -164,6 +164,10 @@ fn run_command(cmd: Command) -> anyhow::Result<()> {
164164 || line. contains ( "error: invalid type: " )
165165 || line. contains ( "error: cyclic feature dependency: feature " )
166166 || line. contains ( "error: cyclic package dependency: package " )
167+ || ( line. contains ( "error: package collision in the lockfile: packages " )
168+ && line. contains (
169+ " are different, but only one can be written to lockfile unambiguously" ,
170+ ) )
167171 {
168172 broken_deps = true ;
169173 } else if line. contains ( "error: failed to parse lock file at" )
Original file line number Diff line number Diff line change @@ -337,7 +337,7 @@ test_prepare_error_stderr!(
337337 "error: Attempting to resolve a dependency with more than one crate with links=ring-asm"
338338) ;
339339
340- test_prepare_uncategorized_err ! (
340+ test_prepare_error_stderr ! (
341341 test_lockfile_collision,
342342 "lockfile-collision" ,
343343 BrokenDependencies ,
You can’t perform that action at this time.
0 commit comments