about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2019-05-28 20:12:48 +0100
committervarkor <github@varkor.com>2019-06-03 18:19:29 +0100
commit81fa794af9c515eb07a1b6956dc048473770b8ae (patch)
tree50c2dd927ce76626fd5a28c63f7641c1c2925a4a /src/test
parent058551c4fdb067a642e096e7c50ea82e3fd09e7c (diff)
downloadrust-81fa794af9c515eb07a1b6956dc048473770b8ae.tar.gz
rust-81fa794af9c515eb07a1b6956dc048473770b8ae.zip
Specify tuple element in lint message
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/lint/must_use-tuple.rs12
-rw-r--r--src/test/ui/lint/must_use-tuple.stderr8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/test/ui/lint/must_use-tuple.rs b/src/test/ui/lint/must_use-tuple.rs
index 3091dbbdf98..efbe0ff9c6c 100644
--- a/src/test/ui/lint/must_use-tuple.rs
+++ b/src/test/ui/lint/must_use-tuple.rs
@@ -1,15 +1,15 @@
 #![deny(unused_must_use)]
 
-fn foo() -> Result<(), ()> {
-    Ok::<(), ()>(())
+fn foo() -> (Result<(), ()>, ()) {
+    (Ok::<(), ()>(()), ())
 }
 
 fn main() {
-    (Ok::<(), ()>(()),); //~ ERROR unused `std::result::Result` that must be used
+    (Ok::<(), ()>(()),); //~ ERROR unused `std::result::Result`
 
     (Ok::<(), ()>(()), 0, Ok::<(), ()>(()), 5);
-    //~^ ERROR unused `std::result::Result` that must be used
-    //~^^ ERROR unused `std::result::Result` that must be used
+    //~^ ERROR unused `std::result::Result`
+    //~^^ ERROR unused `std::result::Result`
 
-    foo(); //~ ERROR unused `std::result::Result` that must be used
+    foo(); //~ ERROR unused `std::result::Result`
 }
diff --git a/src/test/ui/lint/must_use-tuple.stderr b/src/test/ui/lint/must_use-tuple.stderr
index dee53e70edd..4efcb8703aa 100644
--- a/src/test/ui/lint/must_use-tuple.stderr
+++ b/src/test/ui/lint/must_use-tuple.stderr
@@ -1,4 +1,4 @@
-error: unused `std::result::Result` that must be used
+error: unused `std::result::Result` in tuple element 0 that must be used
   --> $DIR/must_use-tuple.rs:8:6
    |
 LL |     (Ok::<(), ()>(()),);
@@ -11,7 +11,7 @@ LL | #![deny(unused_must_use)]
    |         ^^^^^^^^^^^^^^^
    = note: this `Result` may be an `Err` variant, which should be handled
 
-error: unused `std::result::Result` that must be used
+error: unused `std::result::Result` in tuple element 0 that must be used
   --> $DIR/must_use-tuple.rs:10:6
    |
 LL |     (Ok::<(), ()>(()), 0, Ok::<(), ()>(()), 5);
@@ -19,7 +19,7 @@ LL |     (Ok::<(), ()>(()), 0, Ok::<(), ()>(()), 5);
    |
    = note: this `Result` may be an `Err` variant, which should be handled
 
-error: unused `std::result::Result` that must be used
+error: unused `std::result::Result` in tuple element 2 that must be used
   --> $DIR/must_use-tuple.rs:10:27
    |
 LL |     (Ok::<(), ()>(()), 0, Ok::<(), ()>(()), 5);
@@ -27,7 +27,7 @@ LL |     (Ok::<(), ()>(()), 0, Ok::<(), ()>(()), 5);
    |
    = note: this `Result` may be an `Err` variant, which should be handled
 
-error: unused `std::result::Result` that must be used
+error: unused `std::result::Result` in tuple element 0 that must be used
   --> $DIR/must_use-tuple.rs:14:5
    |
 LL |     foo();