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<()> {
164
164
|| line. contains ( "error: invalid type: " )
165
165
|| line. contains ( "error: cyclic feature dependency: feature " )
166
166
|| 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
+ ) )
167
171
{
168
172
broken_deps = true ;
169
173
} 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!(
337
337
"error: Attempting to resolve a dependency with more than one crate with links=ring-asm"
338
338
) ;
339
339
340
- test_prepare_uncategorized_err ! (
340
+ test_prepare_error_stderr ! (
341
341
test_lockfile_collision,
342
342
"lockfile-collision" ,
343
343
BrokenDependencies ,
You can’t perform that action at this time.
0 commit comments