bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Change message to present tense

Browse source
This commit is contained in:
Fabian Drinck 2019-03-17 21:07:57 +01:00
parent 8fb0549151
commit df80eae985
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/lint/builtin.rs
View file

@ -585,7 +585,7 @@ impl BuiltinLintDiagnostics {
let introduced = if is_imported { "imported" } else { "defined" }; let introduced = if is_imported { "imported" } else { "defined" };
db.span_label( db.span_label(
span, span,
format!("the item `{}` was already {} here", ident, introduced) format!("the item `{}` is already {} here", ident, introduced)
); );
} }
} }

4
src/test/ui/lint/lint-unused-imports.stderr
View file

@ -45,7 +45,7 @@ LL | | fn f() {
LL | | self::g(); LL | | self::g();
LL | | } LL | | }
LL | | } LL | | }
| |_- the item `g` was already defined here | |_- the item `g` is already defined here
error: unused import: `self::g` error: unused import: `self::g`
--> $DIR/lint-unused-imports.rs:68:9 --> $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 --> $DIR/lint-unused-imports.rs:78:9
| |
LL | use test2::{foo, bar}; LL | use test2::{foo, bar};
| --- the item `foo` was already imported here | --- the item `foo` is already imported here
... ...
LL | use test2::foo; LL | use test2::foo;
| ^^^^^^^^^^ | ^^^^^^^^^^

4
src/test/ui/lint/use-redundant.stderr
View file

@ -20,7 +20,7 @@ warning: the item `Bar` is imported redundantly
--> $DIR/use-redundant.rs:21:9 --> $DIR/use-redundant.rs:21:9
| |
LL | use crate::foo::Bar; LL | use crate::foo::Bar;
| --------------- the item `Bar` was already imported here | --------------- the item `Bar` is already imported here
... ...
LL | use crate::foo::Bar; LL | use crate::foo::Bar;
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
@ -29,7 +29,7 @@ warning: the item `S` is imported redundantly
--> $DIR/use-redundant.rs:25:9 --> $DIR/use-redundant.rs:25:9
| |
LL | use m1::*; LL | use m1::*;
| ----- the item `S` was already imported here | ----- the item `S` is already imported here
... ...
LL | use m1::S; LL | use m1::S;
| ^^^^^ | ^^^^^