From df80eae985e80e0907c1ebde4caf1d7cc8acbc21 Mon Sep 17 00:00:00 2001
From: Fabian Drinck <fabian.drinck@rwth-aachen.de>
Date: Sun, 17 Mar 2019 21:07:57 +0100
Subject: [PATCH] Change message to present tense

---
 src/librustc/lint/builtin.rs                | 2 +-
 src/test/ui/lint/lint-unused-imports.stderr | 4 ++--
 src/test/ui/lint/use-redundant.stderr       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index 6908674bc13..2d8a2c6321f 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -585,7 +585,7 @@ impl BuiltinLintDiagnostics {
                     let introduced = if is_imported { "imported" } else { "defined" };
                     db.span_label(
                         span,
-                        format!("the item `{}` was already {} here", ident, introduced)
+                        format!("the item `{}` is already {} here", ident, introduced)
                     );
                 }
             }
diff --git a/src/test/ui/lint/lint-unused-imports.stderr b/src/test/ui/lint/lint-unused-imports.stderr
index b37f25ec017..96d71a228a5 100644
--- a/src/test/ui/lint/lint-unused-imports.stderr
+++ b/src/test/ui/lint/lint-unused-imports.stderr
@@ -45,7 +45,7 @@ LL | |     fn f() {
 LL | |         self::g();
 LL | |     }
 LL | | }
-   | |_- the item `g` was already defined here
+   | |_- the item `g` is already defined here
 
 error: unused import: `self::g`
   --> $DIR/lint-unused-imports.rs:68:9
@@ -57,7 +57,7 @@ error: the item `foo` is imported redundantly
   --> $DIR/lint-unused-imports.rs:78:9
    |
 LL | use test2::{foo, bar};
-   |             --- the item `foo` was already imported here
+   |             --- the item `foo` is already imported here
 ...
 LL |     use test2::foo;
    |         ^^^^^^^^^^
diff --git a/src/test/ui/lint/use-redundant.stderr b/src/test/ui/lint/use-redundant.stderr
index 82d2312779e..3554443590a 100644
--- a/src/test/ui/lint/use-redundant.stderr
+++ b/src/test/ui/lint/use-redundant.stderr
@@ -20,7 +20,7 @@ warning: the item `Bar` is imported redundantly
   --> $DIR/use-redundant.rs:21:9
    |
 LL | use crate::foo::Bar;
-   |     --------------- the item `Bar` was already imported here
+   |     --------------- the item `Bar` is already imported here
 ...
 LL |     use crate::foo::Bar;
    |         ^^^^^^^^^^^^^^^
@@ -29,7 +29,7 @@ warning: the item `S` is imported redundantly
   --> $DIR/use-redundant.rs:25:9
    |
 LL | use m1::*;
-   |     ----- the item `S` was already imported here
+   |     ----- the item `S` is already imported here
 ...
 LL |     use m1::S;
    |         ^^^^^