From cfd4c538d462f640013a6bb6b7f1663e82447e1f Mon Sep 17 00:00:00 2001
From: flip1995 <9744647+flip1995@users.noreply.github.com>
Date: Wed, 1 Aug 2018 22:38:04 +0200
Subject: [PATCH] Adapt ui-toml-tests to the tool_lints

---
 .../toml_blacklist/conf_french_blacklisted_name.rs     |  6 +++---
 .../toml_blacklist/conf_french_blacklisted_name.stderr |  2 +-
 tests/ui-toml/toml_trivially_copy/test.rs              |  3 ++-
 tests/ui-toml/toml_trivially_copy/test.stderr          | 10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs
index 1f1a8ee91a18..fe533f521d03 100644
--- a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs
+++ b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs
@@ -1,10 +1,10 @@
-
+#![feature(tool_lints)]
 
 
 #![allow(dead_code)]
-#![allow(single_match)]
+#![allow(clippy::single_match)]
 #![allow(unused_variables)]
-#![warn(blacklisted_name)]
+#![warn(clippy::blacklisted_name)]
 
 fn test(toto: ()) {}
 
diff --git a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr
index b2b0f26b1405..4229b711b0d5 100644
--- a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr
+++ b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr
@@ -4,7 +4,7 @@ error: use of a blacklisted/placeholder name `toto`
 9 | fn test(toto: ()) {}
   |         ^^^^
   |
-  = note: `-D blacklisted-name` implied by `-D warnings`
+  = note: `-D clippy::blacklisted-name` implied by `-D warnings`
 
 error: use of a blacklisted/placeholder name `toto`
   --> $DIR/conf_french_blacklisted_name.rs:12:9
diff --git a/tests/ui-toml/toml_trivially_copy/test.rs b/tests/ui-toml/toml_trivially_copy/test.rs
index bee092a5765a..074ca064ab5c 100644
--- a/tests/ui-toml/toml_trivially_copy/test.rs
+++ b/tests/ui-toml/toml_trivially_copy/test.rs
@@ -1,4 +1,5 @@
-#![allow(many_single_char_names)]
+#![feature(tool_lints)]
+#![allow(clippy::many_single_char_names)]
 
 #[derive(Copy, Clone)]
 struct Foo(u8);
diff --git a/tests/ui-toml/toml_trivially_copy/test.stderr b/tests/ui-toml/toml_trivially_copy/test.stderr
index 2d36c47c5da1..cf2f15a68e67 100644
--- a/tests/ui-toml/toml_trivially_copy/test.stderr
+++ b/tests/ui-toml/toml_trivially_copy/test.stderr
@@ -1,15 +1,15 @@
 error: this argument is passed by reference, but would be more efficient if passed by value
-  --> $DIR/test.rs:12:11
+  --> $DIR/test.rs:13:11
    |
-12 | fn bad(x: &u16, y: &Foo) {
+13 | fn bad(x: &u16, y: &Foo) {
    |           ^^^^ help: consider passing by value instead: `u16`
    |
-   = note: `-D trivially-copy-pass-by-ref` implied by `-D warnings`
+   = note: `-D clippy::trivially-copy-pass-by-ref` implied by `-D warnings`
 
 error: this argument is passed by reference, but would be more efficient if passed by value
-  --> $DIR/test.rs:12:20
+  --> $DIR/test.rs:13:20
    |
-12 | fn bad(x: &u16, y: &Foo) {
+13 | fn bad(x: &u16, y: &Foo) {
    |                    ^^^^ help: consider passing by value instead: `Foo`
 
 error: aborting due to 2 previous errors