Auto merge of #4110 - rust-lang:symbolic_wasteland, r=oli-obk
Prevent symbocalypse
r? @Manishearth
This is strictly better, we can just not modify rustc and bump solely the clippy submodule and then implement diagnostic lang items without beta looming over us
changelog: none