Clean up some code#43006

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

GuillaumeGomez:e0611-cleanupGuillaumeGomez/rust:e0611-cleanupCopy head branch name to clipboard