diff options
| author | bors <bors@rust-lang.org> | 2017-11-24 04:03:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-24 04:03:36 +0000 |
| commit | eb44c89641f6b570d2ec934f5b43f865b31d7dcb (patch) | |
| tree | e6bd34e837beb76ae8734b9b2ab6f96ffdc0424b /src/rustllvm/RustWrapper.cpp | |
| parent | 93426613a78a9e4477071d69dcccd6d4217e5c1d (diff) | |
| parent | 5eb5e91d7b483edc903ca9c35bdd925d578f45e7 (diff) | |
| download | rust-eb44c89641f6b570d2ec934f5b43f865b31d7dcb.tar.gz rust-eb44c89641f6b570d2ec934f5b43f865b31d7dcb.zip | |
Auto merge of #45946 - estebank:crate-conflict-diag, r=arielb1
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
```
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions