Merge rustc_lint/lints.rs into diagnostics.rs - #160755

Merge rustc_lint/lints.rs into diagnostics.rs#160755

rust-bors[bot] merged 1 commit into

rust-lang:mainrust-lang/rust:mainfrom

JonathanBrouwer:rustc_lint_diagsJonathanBrouwer/rust:rustc_lint_diagsCopy head branch name to clipboard