]> git.lizzy.rs Git - rust.git/commitdiff
Merge #6932
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Fri, 18 Dec 2020 17:48:41 +0000 (17:48 +0000)
committerGitHub <noreply@github.com>
Fri, 18 Dec 2020 17:48:41 +0000 (17:48 +0000)
6932: Added a warning if conflicting rust-lang.rust is enabled. r=lnicola a=extremegf

Added a warning if conflicting rust-lang.rust plugin is enabled.

Resolves #6463

![Screenshot from 2020-12-18 18-33-02](https://user-images.githubusercontent.com/1788593/102644202-b2f50500-4160-11eb-8fb0-76aeebd80aea.png)

Co-authored-by: Przemyslaw Horban <p.horban@invinets.com>

Trivial merge