Minor fixes to `$crate` behavior#1816

ehuss merged 2 commits intorust-lang:masterrust-lang/reference:masterfrom

Daniel-Aaron-Bloom:dollar-crateDaniel-Aaron-Bloom/reference:dollar-crateCopy head branch name to clipboard