bors eb44c89641 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
```

2017-11-24 04:03:36 +00:00

..

astencode.rs

…

build.rs

…

Cargo.toml

…

creader.rs

incr.comp.: Provide session to some more decoding contexts.

2017-11-08 14:52:00 +01:00

cstore_impl.rs

remove the generator_sigs map, query, and plumbing

2017-11-18 07:47:38 -05:00

cstore.rs

rustc_driver: base extern query providers on local ones.

2017-11-12 18:20:15 +02:00

decoder.rs

remove the generator_sigs map, query, and plumbing

2017-11-18 07:47:38 -05:00

diagnostics.rs

…

encoder.rs

Auto merge of #45879 - nikomatsakis:nll-kill-cyclic-closures, r=arielb1

2017-11-21 22:52:19 +00:00

index_builder.rs

incr.comp.: Remove default serialization implementations for things in rustc::hir::def_id so that we get an ICE instead of silently doing the wrong thing.

2017-11-16 17:13:39 +01:00

index.rs

…

isolated_encoder.rs

…

lib.rs

incr.comp.: Factor some persistence functionality out of crate metadata code.

2017-10-24 14:01:44 +02:00

link_args.rs

…

locator.rs

Use multiline text for crate conflict diagnostics

2017-11-22 18:45:32 -08:00

native_libs.rs

…

schema.rs

remove the generator_sigs map, query, and plumbing

2017-11-18 07:47:38 -05:00