Uh oh!
There was an error while loading. Please reload this page.
Use multiline text for crate conflict diagnostics - #45946
Conversation
9cf3d25 to
7e2cd70Compareestebank
commented
Nov 13, 2017
r? @arielb1 |
kennytm
commented
Nov 13, 2017
What is the motivation? The new one doesn't look clearer than the old one. |
estebank
commented
Nov 13, 2017
@kennytm I felt some of the text was redundant as all you care about is the path (I feel that even the crate name could be removed), but even if we keep exactly the same wording I'd prefer if these were all one |
shepmaster
commented
Nov 18, 2017
Ping from triage, @arielb1 — will you be able to take a look at this sometime soon? |
arielb1
commented
Nov 18, 2017
@bors r+ |
bors
commented
Nov 18, 2017
📌 Commit 7e2cd70 has been approved by |
bors
commented
Nov 18, 2017
⌛ Testing commit 7e2cd702c23a906d762c564faf7ab78b45c0b2ec with merge 47b8216478537dde3e2dfe09ad94c2384595d1d9... |
bors
commented
Nov 18, 2017
💔 Test failed - status-travis |
arielb1
commented
Nov 18, 2017
test failure: |
7e2cd70 to
392bcbdCompare392bcbd to
5eb5e91Compareestebank
commented
Nov 23, 2017
@bors r=arielb1 |
bors
commented
Nov 23, 2017
📌 Commit 5eb5e91 has been approved by |
bors
commented
Nov 24, 2017
Use multiline text for crate conflict diagnostics After: ``` error[E0464]: multiple matching crates for `libc` --> /checkout/src/rustc/dlmalloc_shim/../../dlmalloc/src/linux.rs:1:1 | 1 | extern crate libc; | ^^^^^^^^^^^^^^^^^^ | = note: candidates: crate `libc`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-658d35794c10b003.rlib crate `libc`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f32a17a3111b01aa.rlib ``` Before: ``` error[E0464]: multiple matching crates for `libc` --> /checkout/src/rustc/dlmalloc_shim/../../dlmalloc/src/linux.rs:1:1 | 1 | extern crate libc; | ^^^^^^^^^^^^^^^^^^ | = note: candidates: = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-658d35794c10b003.rlib = note: crate name: libc = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f32a17a3111b01aa.rlib = note: crate name: libc ```
bors
commented
Nov 24, 2017
☀️ Test successful - status-appveyor, status-travis |
After:
Before: