Skip to content

Use multiline text for crate conflict diagnostics - #45946

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:crate-conflict-diag
Nov 24, 2017
Merged

Use multiline text for crate conflict diagnostics#45946
bors merged 1 commit into
rust-lang:masterfrom
estebank:crate-conflict-diag

Conversation

@estebank

Copy link
Copy Markdown
Contributor

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

@estebank

Copy link
Copy Markdown
ContributorAuthor

r? @arielb1

@kennytmkennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2017
@kennytm

Copy link
Copy Markdown
Member

What is the motivation? The new one doesn't look clearer than the old one.

@estebank

Copy link
Copy Markdown
ContributorAuthor

@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 note with multiple lines, instead of being multiple disconnected notes for the sake of third party tools that can then display the text consistently, instead as independent disjointed notes.

@shepmaster

Copy link
Copy Markdown
Member

Ping from triage, @arielb1 — will you be able to take a look at this sometime soon?

@arielb1

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 7e2cd70 has been approved by arielb1

@bors

bors commented Nov 18, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7e2cd702c23a906d762c564faf7ab78b45c0b2ec with merge 47b8216478537dde3e2dfe09ad94c2384595d1d9...

@kennytmkennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2017
@bors

bors commented Nov 18, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@arielb1

Copy link
Copy Markdown
Contributor

test failure:

[00:57:26] failures:
[00:57:26] [run-make] run-make/many-crates-but-no-match

@kennytmkennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 19, 2017
@estebank

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented Nov 23, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 5eb5e91 has been approved by arielb1

@kennytmkennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 23, 2017
@bors

bors commented Nov 24, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5eb5e91 with merge eb44c89...

bors added a commit that referenced this pull request 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

bors commented Nov 24, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing eb44c89 to master...

@bors
bors merged commit 5eb5e91 into rust-lang:masterNov 24, 2017
@estebank
estebank deleted the crate-conflict-diag branch November 9, 2023 05:25
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@estebank@kennytm@shepmaster@arielb1@bors