File tree 5 files changed +12
-13
lines changed
compiler/rustc_metadata/src
5 files changed +12
-13
lines changed Original file line number Diff line number Diff line change @@ -474,9 +474,8 @@ impl<'a> CrateLocator<'a> {
474
474
0 => Ok ( None ) ,
475
475
1 => Ok ( Some ( libraries. into_iter ( ) . next ( ) . unwrap ( ) . 1 ) ) ,
476
476
_ => {
477
- let mut libraries: Vec < _ > = libraries. into_values ( ) . collect ( ) ;
477
+ let libraries: Vec < _ > = libraries. into_values ( ) . collect ( ) ;
478
478
479
- libraries. sort_by_cached_key ( |lib| lib. source . paths ( ) . next ( ) . unwrap ( ) . clone ( ) ) ;
480
479
let candidates = libraries
481
480
. iter ( )
482
481
. map ( |lib| lib. source . paths ( ) . next ( ) . unwrap ( ) . clone ( ) )
Original file line number Diff line number Diff line change @@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
4
4
LL | extern crate crateresolve1;
5
5
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
6
6
|
7
- = note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1 .somelib
8
- = note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2 .somelib
9
- = note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3 .somelib
7
+ = note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3 .somelib
8
+ = note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1 .somelib
9
+ = note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2 .somelib
10
10
11
11
error: aborting due to 1 previous error
12
12
Original file line number Diff line number Diff line change @@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rmeta` dependency `crateresolve2` found
4
4
LL | extern crate crateresolve2;
5
5
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
6
6
|
7
- = note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-1 .rmeta
7
+ = note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-3 .rmeta
8
8
= note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-2.rmeta
9
- = note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-3 .rmeta
9
+ = note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-1 .rmeta
10
10
11
11
error: aborting due to 1 previous error
12
12
Original file line number Diff line number Diff line change @@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
4
4
LL | extern crate crateresolve1;
5
5
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
6
6
|
7
- = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1 .somelib
8
- = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2 .somelib
9
- = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3 .somelib
7
+ = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3 .somelib
8
+ = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1 .somelib
9
+ = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2 .somelib
10
10
11
11
error: aborting due to 1 previous error
12
12
Original file line number Diff line number Diff line change @@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
4
4
LL | extern crate crateresolve1;
5
5
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
6
6
|
7
- = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-1 .somelib
8
- = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-2 .somelib
9
- = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-3 .somelib
7
+ = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-3 .somelib
8
+ = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-1 .somelib
9
+ = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-2 .somelib
10
10
11
11
error: aborting due to 1 previous error
12
12
You can’t perform that action at this time.
0 commit comments