Merge branch 'master' into patch-2

diff --cc compiler/rustc_lint/src/let_underscore.rs
Simple merge

diff --cc compiler/rustc_lint/src/opaque_hidden_inferred_bound.rs
Simple merge

diff --cc compiler/rustc_lint_defs/src/builtin.rs
Simple merge