address comments

rust-lang · Jun 27, 2022 · 3d0f73e · 3d0f73e
1 parent d8e6c33
commit 3d0f73e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,7 @@ termize = "0.1"
 compiletest_rs = { version = "0.8", features = ["tmp"] }
 tester = "0.9"
 regex = "1.5"
+toml = "0.5"
 # This is used by the `collect-metadata` alias.
 filetime = "0.2"
 
@@ -52,7 +53,6 @@ futures = "0.3"
 parking_lot = "0.12"
 tokio = { version = "1", features = ["io-util"] }
 rustc-semver = "1.1"
-toml = "0.5"
 
 [build-dependencies]
 rustc_tools_util = { version = "0.2", path = "rustc_tools_util" }

diff --git a/README.md b/README.md
@@ -218,6 +218,7 @@ Alternatively, the [`rust-version` field](https://doc.rust-lang.org/cargo/refere
 in the `Cargo.toml` can be used.
 
 ```toml
+# Cargo.toml
 rust-version = "1.30"
 ```
 

diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
@@ -470,7 +470,7 @@ fn read_msrv(conf: &Conf, sess: &Session) -> Option<RustcVersion> {
             // if both files have an msrv, let's compare them and emit a warning if they differ
             if clippy_msrv != cargo_msrv {
                 sess.warn(&format!(
-                    "the MSRV in `clippy.toml` and `Cargo.toml` differ; using `{}`",
+                    "the MSRV in `clippy.toml` and `Cargo.toml` differ; using `{}` from `clippy.toml`",
                     clippy_msrv
                 ));
             }

diff --git a/tests/ui-cargo/cargo_rust_version/fail_file_attr/src/main.rs b/tests/ui-cargo/cargo_rust_version/fail_file_attr/src/main.rs
@@ -1,3 +1,6 @@
+// FIXME: this should produce a warning, because the attribute says 1.58 and the cargo.toml file
+// says 1.13
+
 #![feature(custom_inner_attributes)]
 #![clippy::msrv = "1.58.0"]
 #![deny(clippy::use_self)]