Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use multiline text for crate conflict diagnostics #45946

Merged
merged 1 commit into from
Nov 24, 2017
Merged

Use multiline text for crate conflict diagnostics #45946

merged 1 commit into from
Nov 24, 2017

Conversation

estebank
Copy link
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 estebank force-pushed the crate-conflict-diag branch from 9cf3d25 to 7e2cd70 Compare November 13, 2017 06:38
@estebank
Copy link
Contributor Author

r? @arielb1

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

kennytm commented Nov 13, 2017

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

@estebank
Copy link
Contributor Author

@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
Member

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

@arielb1
Copy link
Contributor

arielb1 commented Nov 18, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 18, 2017

📌 Commit 7e2cd70 has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Nov 18, 2017

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

@kennytm kennytm 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
Copy link
Collaborator

bors commented Nov 18, 2017

💔 Test failed - status-travis

@arielb1
Copy link
Contributor

arielb1 commented Nov 18, 2017

test failure:

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

@kennytm kennytm 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 estebank force-pushed the crate-conflict-diag branch from 7e2cd70 to 392bcbd Compare November 23, 2017 02:45
@estebank estebank force-pushed the crate-conflict-diag branch from 392bcbd to 5eb5e91 Compare November 23, 2017 02:46
@estebank
Copy link
Contributor Author

@bors r=arielb1

@bors
Copy link
Collaborator

bors commented Nov 23, 2017

📌 Commit 5eb5e91 has been approved by arielb1

@kennytm kennytm 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
Copy link
Collaborator

bors commented Nov 24, 2017

⌛ Testing commit 5eb5e91 with merge eb44c89...

bors added a commit that referenced this pull request Nov 24, 2017
@bors
Auto merge of #45946 - estebank:crate-conflict-diag, r=arielb1
eb44c89 
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
Copy link
Collaborator

bors commented Nov 24, 2017

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

@bors bors merged commit 5eb5e91 into rust-lang:master Nov 24, 2017
@bors bors mentioned this pull request Nov 24, 2017
Merged
@estebank estebank deleted the crate-conflict-diag branch November 9, 2023 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arielb1 arielb1

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@estebank @kennytm @shepmaster @arielb1 @bors