user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: merge E0465 into E0464

Browse source
This commit is contained in:
Ezra Shaw 2022-12-22 20:21:43 +13:00
parent 5570cda187
commit 24b39ece2f
No known key found for this signature in database
GPG key ID: 17CD5C2ADAE0D344
17 changed files with 59 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/crate-loading/auxiliary/crateresolve1-1.rs
View file

@ -1,4 +1,5 @@
// compile-flags:-C extra-filename=-1
// no-prefer-dynamic
#![crate_name = "crateresolve1"]
#![crate_type = "lib"]

1
src/test/ui/crate-loading/auxiliary/crateresolve1-2.rs
View file

@ -1,4 +1,5 @@
// compile-flags:-C extra-filename=-2
// no-prefer-dynamic
#![crate_name = "crateresolve1"]
#![crate_type = "lib"]

1
src/test/ui/crate-loading/auxiliary/crateresolve1-3.rs
View file

@ -1,4 +1,5 @@
// compile-flags:-C extra-filename=-3
// no-prefer-dynamic
#![crate_name = "crateresolve1"]
#![crate_type = "lib"]

5
src/test/ui/crate-loading/crateresolve1.rs
View file

@ -9,7 +9,6 @@
// NOTE: This test is duplicated at `src/test/ui/error-codes/E0464.rs`.
extern crate crateresolve1;
//~^ ERROR multiple matching crates for `crateresolve1`
//~^ ERROR multiple candidates for `rlib` dependency `crateresolve1` found
fn main() {
}
fn main() {}

9
src/test/ui/crate-loading/crateresolve1.stderr
View file

@ -1,13 +1,12 @@
error[E0464]: multiple matching crates for `crateresolve1`
error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
--> $DIR/crateresolve1.rs:11:1
|
LL | extern crate crateresolve1;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: candidates:
crate `crateresolve1`: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1.somelib
crate `crateresolve1`: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2.somelib
crate `crateresolve1`: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3.somelib
= note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1.somelib
= note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2.somelib
= note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3.somelib
error: aborting due to previous error

5
src/test/ui/crate-loading/crateresolve2.rs
View file

@ -8,7 +8,6 @@
// normalize-stderr-test: "\\\?\\" -> ""
extern crate crateresolve2;
//~^ ERROR multiple matching crates for `crateresolve2`
//~^ ERROR multiple candidates for `rmeta` dependency `crateresolve2` found
fn main() {
}
fn main() {}

9
src/test/ui/crate-loading/crateresolve2.stderr
View file

@ -1,13 +1,12 @@
error[E0464]: multiple matching crates for `crateresolve2`
error[E0464]: multiple candidates for `rmeta` dependency `crateresolve2` found
--> $DIR/crateresolve2.rs:10:1
|
LL | extern crate crateresolve2;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: candidates:
crate `crateresolve2`: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-1.rmeta
crate `crateresolve2`: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-2.rmeta
crate `crateresolve2`: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-3.rmeta
= note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-1.rmeta
= note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-2.rmeta
= note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-3.rmeta
error: aborting due to previous error

5
src/test/ui/error-codes/E0464.rs
View file

@ -9,7 +9,6 @@
// NOTE: This test is duplicated from `src/test/ui/crate-loading/crateresolve1.rs`.
extern crate crateresolve1;
//~^ ERROR multiple matching crates for `crateresolve1`
//~^ ERROR multiple candidates for `rlib` dependency `crateresolve1` found
fn main() {
}
fn main() {}

9
src/test/ui/error-codes/E0464.stderr
View file

@ -1,13 +1,12 @@
error[E0464]: multiple matching crates for `crateresolve1`
error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
--> $DIR/E0464.rs:11:1
|
LL | extern crate crateresolve1;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: candidates:
crate `crateresolve1`: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1.somelib
crate `crateresolve1`: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2.somelib
crate `crateresolve1`: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3.somelib
= note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1.somelib
= note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2.somelib
= note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3.somelib
error: aborting due to previous error

1
src/test/ui/error-codes/auxiliary/crateresolve1-1.rs
View file

@ -1,4 +1,5 @@
// compile-flags:-C extra-filename=-1
// no-prefer-dynamic
#![crate_name = "crateresolve1"]
#![crate_type = "lib"]

1
src/test/ui/error-codes/auxiliary/crateresolve1-2.rs
View file

@ -1,4 +1,5 @@
// compile-flags:-C extra-filename=-2
// no-prefer-dynamic
#![crate_name = "crateresolve1"]
#![crate_type = "lib"]

1
src/test/ui/error-codes/auxiliary/crateresolve1-3.rs
View file

@ -1,4 +1,5 @@
// compile-flags:-C extra-filename=-3
// no-prefer-dynamic
#![crate_name = "crateresolve1"]
#![crate_type = "lib"]

4
src/tools/tidy/src/error_codes_check.rs
View file

@ -11,8 +11,8 @@ use regex::Regex;
// A few of those error codes can't be tested but all the others can and *should* be tested!
const EXEMPTED_FROM_TEST: &[&str] = &[
"E0313", "E0461", "E0465", "E0476", "E0490", "E0514", "E0523", "E0554", "E0640", "E0717",
"E0729", "E0789",
"E0313", "E0461", "E0476", "E0490", "E0514", "E0523", "E0554", "E0640", "E0717", "E0729",
"E0789",
];
// Some error codes don't have any tests apparently...