Skip to content

Commit 2ba567f

Browse files
committed
fix other tests failing due to change in case or new suggestion for extern crate
1 parent ad4cea4 commit 2ba567f

31 files changed

+54
-52
lines changed

src/test/ui/blind/blind-item-block-item-shadow.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use foo::Bar;
77
| ^^^^^^^^ `Bar` reimported here
88
|
99
= note: `Bar` must be defined only once in the type namespace of this block
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use foo::Bar as OtherBar;
1313
| ^^^^^^^^^^^^^^^^^^^^

src/test/ui/blind/blind-item-item-shadow.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | use foo::foo;
88
| ^^^^^^^^ `foo` reimported here
99
|
1010
= note: `foo` must be defined only once in the type namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use foo::foo as other_foo;
1414
| ^^^^^^^^^^^^^^^^^^^^^

src/test/ui/double-import.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use sub2::foo; //~ ERROR the name `foo` is defined multiple times
77
| ^^^^^^^^^ `foo` reimported here
88
|
99
= note: `foo` must be defined only once in the value namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use sub2::foo as other_foo; //~ ERROR the name `foo` is defined multiple times
1313
| ^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/double-type-import.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use self::bar::X;
77
| ^^^^^^^^^^^^ `X` reimported here
88
|
99
= note: `X` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use self::bar::X as OtherX;
1313
| ^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/duplicate/duplicate-check-macro-exports.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | macro_rules! panic { () => {} } //~ ERROR the name `panic` is defined multi
88
| ^^^^^^^^^^^^^^^^^^ `panic` redefined here
99
|
1010
= note: `panic` must be defined only once in the macro namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | pub use std::panic as other_panic;
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/error-codes/E0252.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use bar::baz; //~ ERROR E0252
77
| ^^^^^^^^ `baz` reimported here
88
|
99
= note: `baz` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use bar::baz as other_baz; //~ ERROR E0252
1313
| ^^^^^^^^^^^^^^^^^^^^^

src/test/ui/error-codes/E0254.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | use foo::alloc;
88
| ^^^^^^^^^^ `alloc` reimported here
99
|
1010
= note: `alloc` must be defined only once in the type namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use foo::alloc as other_alloc;
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/error-codes/E0255.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | fn foo() {} //~ ERROR E0255
88
| ^^^^^^^^ `foo` redefined here
99
|
1010
= note: `foo` must be defined only once in the value namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use bar::foo as other_foo;
1414
| ^^^^^^^^^^^^^^^^^^^^^

src/test/ui/error-codes/E0259.stderr

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ LL | extern crate alloc;
55
| ------------------- previous import of the extern crate `alloc` here
66
LL |
77
LL | extern crate libc as alloc;
8-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
9-
| |
10-
| `alloc` reimported here
11-
| You can use `as` to change the binding name of the import
8+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `alloc` reimported here
129
|
1310
= note: `alloc` must be defined only once in the type namespace of this module
11+
help: you can use `as` to change the binding name of the import
12+
|
13+
LL | extern crate libc as other_alloc;
14+
|
1415

1516
error: aborting due to previous error
1617

src/test/ui/error-codes/E0260.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | mod alloc {
88
| ^^^^^^^^^ `alloc` redefined here
99
|
1010
= note: `alloc` must be defined only once in the type namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | extern crate alloc as other_alloc;
1414
|

src/test/ui/error-codes/E0430.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LL | use std::fmt::{self, self}; //~ ERROR E0430
1515
| previous import of the module `fmt` here
1616
|
1717
= note: `fmt` must be defined only once in the type namespace of this module
18-
help: You can use `as` to change the binding name of the import
18+
help: you can use `as` to change the binding name of the import
1919
|
2020
LL | use std::fmt::{self, self as other_fmt}; //~ ERROR E0430
2121
| ^^^^^^^^^^^^^^^^^

src/test/ui/extern/extern-crate-rename.stderr

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ error[E0259]: the name `m1` is defined multiple times
44
LL | extern crate m1;
55
| ---------------- previous import of the extern crate `m1` here
66
LL | extern crate m2 as m1; //~ ERROR is defined multiple times
7-
| ^^^^^^^^^^^^^^^^^^^^^^
8-
| |
9-
| `m1` reimported here
10-
| You can use `as` to change the binding name of the import
7+
| ^^^^^^^^^^^^^^^^^^^^^^ `m1` reimported here
118
|
129
= note: `m1` must be defined only once in the type namespace of this module
10+
help: you can use `as` to change the binding name of the import
11+
|
12+
LL | extern crate m2 as other_m1; //~ ERROR is defined multiple times
13+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1314

1415
error: aborting due to previous error
1516

src/test/ui/imports/duplicate.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use a::foo; //~ ERROR the name `foo` is defined multiple times
77
| ^^^^^^ `foo` reimported here
88
|
99
= note: `foo` must be defined only once in the value namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use a::foo as other_foo; //~ ERROR the name `foo` is defined multiple times
1313
| ^^^^^^^^^^^^^^^^^^^

src/test/ui/issues/issue-19498.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | mod A {} //~ ERROR the name `A` is defined multiple times
88
| ^^^^^ `A` redefined here
99
|
1010
= note: `A` must be defined only once in the type namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use self::A as OtherA;
1414
| ^^^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ LL | pub mod B {} //~ ERROR the name `B` is defined multiple times
2323
| ^^^^^^^^^ `B` redefined here
2424
|
2525
= note: `B` must be defined only once in the type namespace of this module
26-
help: You can use `as` to change the binding name of the import
26+
help: you can use `as` to change the binding name of the import
2727
|
2828
LL | use self::B as OtherB;
2929
| ^^^^^^^^^^^^^^^^^
@@ -37,7 +37,7 @@ LL | mod D {} //~ ERROR the name `D` is defined multiple times
3737
| ^^^^^ `D` redefined here
3838
|
3939
= note: `D` must be defined only once in the type namespace of this module
40-
help: You can use `as` to change the binding name of the import
40+
help: you can use `as` to change the binding name of the import
4141
|
4242
LL | use C::D as OtherD;
4343
| ^^^^^^^^^^^^^^

src/test/ui/issues/issue-24081.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | type Add = bool; //~ ERROR the name `Add` is defined multiple times
88
| ^^^^^^^^^^^^^^^^ `Add` redefined here
99
|
1010
= note: `Add` must be defined only once in the type namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use std::ops::Add as OtherAdd;
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ LL | struct Sub { x: f32 } //~ ERROR the name `Sub` is defined multiple times
2323
| ^^^^^^^^^^ `Sub` redefined here
2424
|
2525
= note: `Sub` must be defined only once in the type namespace of this module
26-
help: You can use `as` to change the binding name of the import
26+
help: you can use `as` to change the binding name of the import
2727
|
2828
LL | use std::ops::Sub as OtherSub;
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -38,7 +38,7 @@ LL | enum Mul { A, B } //~ ERROR the name `Mul` is defined multiple times
3838
| ^^^^^^^^ `Mul` redefined here
3939
|
4040
= note: `Mul` must be defined only once in the type namespace of this module
41-
help: You can use `as` to change the binding name of the import
41+
help: you can use `as` to change the binding name of the import
4242
|
4343
LL | use std::ops::Mul as OtherMul;
4444
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -53,7 +53,7 @@ LL | mod Div { } //~ ERROR the name `Div` is defined multiple times
5353
| ^^^^^^^ `Div` redefined here
5454
|
5555
= note: `Div` must be defined only once in the type namespace of this module
56-
help: You can use `as` to change the binding name of the import
56+
help: you can use `as` to change the binding name of the import
5757
|
5858
LL | use std::ops::Div as OtherDiv;
5959
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -68,7 +68,7 @@ LL | trait Rem { } //~ ERROR the name `Rem` is defined multiple times
6868
| ^^^^^^^^^ `Rem` redefined here
6969
|
7070
= note: `Rem` must be defined only once in the type namespace of this module
71-
help: You can use `as` to change the binding name of the import
71+
help: you can use `as` to change the binding name of the import
7272
|
7373
LL | use std::ops::Rem as OtherRem;
7474
| ^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/issues/issue-25396.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use bar::baz; //~ ERROR the name `baz` is defined multiple times
77
| ^^^^^^^^ `baz` reimported here
88
|
99
= note: `baz` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use bar::baz as other_baz; //~ ERROR the name `baz` is defined multiple times
1313
| ^^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ LL | use bar::Quux; //~ ERROR the name `Quux` is defined multiple times
2121
| ^^^^^^^^^ `Quux` reimported here
2222
|
2323
= note: `Quux` must be defined only once in the type namespace of this module
24-
help: You can use `as` to change the binding name of the import
24+
help: you can use `as` to change the binding name of the import
2525
|
2626
LL | use bar::Quux as OtherQuux; //~ ERROR the name `Quux` is defined multiple times
2727
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -35,7 +35,7 @@ LL | use bar::blah; //~ ERROR the name `blah` is defined multiple times
3535
| ^^^^^^^^^ `blah` reimported here
3636
|
3737
= note: `blah` must be defined only once in the type namespace of this module
38-
help: You can use `as` to change the binding name of the import
38+
help: you can use `as` to change the binding name of the import
3939
|
4040
LL | use bar::blah as other_blah; //~ ERROR the name `blah` is defined multiple times
4141
| ^^^^^^^^^^^^^^^^^^^^^^^
@@ -49,7 +49,7 @@ LL | use bar::WOMP; //~ ERROR the name `WOMP` is defined multiple times
4949
| ^^^^^^^^^ `WOMP` reimported here
5050
|
5151
= note: `WOMP` must be defined only once in the value namespace of this module
52-
help: You can use `as` to change the binding name of the import
52+
help: you can use `as` to change the binding name of the import
5353
|
5454
LL | use bar::WOMP as OtherWOMP; //~ ERROR the name `WOMP` is defined multiple times
5555
| ^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/issues/issue-26886.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use std::sync::Arc; //~ ERROR the name `Arc` is defined multiple times
77
| ^^^^^^^^^^^^^^ `Arc` reimported here
88
|
99
= note: `Arc` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use std::sync::Arc as OtherArc; //~ ERROR the name `Arc` is defined multiple times
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -22,7 +22,7 @@ LL | use std::sync; //~ ERROR the name `sync` is defined multiple times
2222
| ^^^^^^^^^ `sync` reimported here
2323
|
2424
= note: `sync` must be defined only once in the type namespace of this module
25-
help: You can use `as` to change the binding name of the import
25+
help: you can use `as` to change the binding name of the import
2626
|
2727
LL | use std::sync as other_sync; //~ ERROR the name `sync` is defined multiple times
2828
| ^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/issues/issue-32354-suggest-import-rename.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use extension2::ConstructorExtension; //~ ERROR is defined multiple times
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ConstructorExtension` reimported here
88
|
99
= note: `ConstructorExtension` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use extension2::ConstructorExtension as OtherConstructorExtension; //~ ERROR is defined multiple times
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | extern crate std;
55
| ^^^^^^^^^^^^^^^^^ `std` reimported here
66
|
77
= note: `std` must be defined only once in the type namespace of this module
8-
help: You can use `as` to change the binding name of the import
8+
help: you can use `as` to change the binding name of the import
99
|
1010
LL | extern crate std as other_std;
1111
|

src/test/ui/issues/issue-8640.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | mod bar {}
77
| ^^^^^^^ `bar` redefined here
88
|
99
= note: `bar` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use baz::bar as other_bar;
1313
| ^^^^^^^^^^^^^^^^^^^^^

src/test/ui/no-std-inject.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | extern crate core; //~ ERROR: the name `core` is defined multiple times
55
| ^^^^^^^^^^^^^^^^^^ `core` reimported here
66
|
77
= note: `core` must be defined only once in the type namespace of this module
8-
help: You can use `as` to change the binding name of the import
8+
help: you can use `as` to change the binding name of the import
99
|
1010
LL | extern crate core as other_core; //~ ERROR: the name `core` is defined multiple times
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | extern crate std;
55
| ^^^^^^^^^^^^^^^^^ `std` reimported here
66
|
77
= note: `std` must be defined only once in the type namespace of this module
8-
help: You can use `as` to change the binding name of the import
8+
help: you can use `as` to change the binding name of the import
99
|
1010
LL | extern crate std as other_std;
1111
|

src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | use std::slice as std; //~ ERROR the name `std` is defined multiple times
55
| ^^^^^^^^^^^^^^^^^ `std` reimported here
66
|
77
= note: `std` must be defined only once in the type namespace of this module
8-
help: You can use `as` to change the binding name of the import
8+
help: you can use `as` to change the binding name of the import
99
|
1010
LL | use std::slice as other_std; //~ ERROR the name `std` is defined multiple times
1111
| ^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/resolve/resolve-conflict-import-vs-import.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use std::mem::transmute;
77
| ^^^^^^^^^^^^^^^^^^^ `transmute` reimported here
88
|
99
= note: `transmute` must be defined only once in the value namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use std::mem::transmute as other_transmute;
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | mod std {} //~ ERROR the name `std` is defined multiple times
55
| ^^^^^^^ `std` redefined here
66
|
77
= note: `std` must be defined only once in the type namespace of this module
8-
help: You can use `as` to change the binding name of the import
8+
help: you can use `as` to change the binding name of the import
99
|
1010
LL | as other_std// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1111
| ^^^^^^^^^^^^

src/test/ui/resolve/resolve-conflict-item-vs-import.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | fn transmute() {}
88
| ^^^^^^^^^^^^^^ `transmute` redefined here
99
|
1010
= note: `transmute` must be defined only once in the value namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use std::mem::transmute as other_transmute;
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/resolve/resolve-conflict-type-vs-import.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | struct Iter;
88
| ^^^^^^^^^^^^ `Iter` redefined here
99
|
1010
= note: `Iter` must be defined only once in the type namespace of this module
11-
help: You can use `as` to change the binding name of the import
11+
help: you can use `as` to change the binding name of the import
1212
|
1313
LL | use std::slice::Iter as OtherIter;
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use core;
77
| ^^^^ `core` reimported here
88
|
99
= note: `core` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use core as other_core;
1313
| ^^^^^^^^^^^^^^^^^^

src/test/ui/use/use-mod.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LL | self
2323
| ^^^^ `bar` reimported here
2424
|
2525
= note: `bar` must be defined only once in the type namespace of this module
26-
help: You can use `as` to change the binding name of the import
26+
help: you can use `as` to change the binding name of the import
2727
|
2828
LL | self as other_bar
2929
|

src/test/ui/use/use-paths-as-items.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | use std::mem; //~ ERROR the name `mem` is defined multiple times
77
| ^^^^^^^^ `mem` reimported here
88
|
99
= note: `mem` must be defined only once in the type namespace of this module
10-
help: You can use `as` to change the binding name of the import
10+
help: you can use `as` to change the binding name of the import
1111
|
1212
LL | use std::mem as other_mem; //~ ERROR the name `mem` is defined multiple times
1313
| ^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)