Commits on Mar 16, 2021

1. Auto merge of rust-lang#9276 - ehuss:fix-collision-root-removal, r=al… …

   …excrichton
   
   Fix doc duplicate removal of root units.
   
   The doc collision removal code didn't consider the possibility that there was a collision with a root unit.  This caused problems in conjunction with rust-lang#9142 where cargo would panic because a root unit got removed from the graph because of a filename collision. The solution here is to avoid removing root units during the doc collision sweep.
   
   This has a downside that this reintroduces a filename collision.
   
   An alternate solution would be to make the set of root units mutable, and remove from that list, but I figured this is simpler and more conservative.
   
   Fixes rust-lang#9274

   

   bors authored and ehuss committed Mar 16, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for b6bcaf3
   • Browse repository at this point

   Copy the full SHA

   b6bcaf3 View commit details

   Browse the repository at this point in the history

2. Auto merge of rust-lang#9275 - ehuss:features-non-member, r=alexcrichton …

   Fix --feature pkg/feat for V1 resolver for non-member.
   
   rust-lang#8997 had an unintended regression where `-p foo --feature foo/feat` syntax where `foo` is an **optional non-member** fails with an error that `foo` did not match any packages.  The issue is that the member/feature selection routine needed to slot this into the features for the package in the current working directory (it was incorrectly treating `foo` as a workspace member).
   
   V2 outright does not allow specifying features for non-workspace members.
   
   Fixes rust-lang#9265

   

   bors authored and ehuss committed Mar 16, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for 77a13c0
   • Browse repository at this point

   Copy the full SHA

   77a13c0 View commit details

   Browse the repository at this point in the history