Show one error for duplicated type definitions by estebank · Pull Request #37447 · rust-lang/rust

estebank · 2016-10-28T07:34:34Z

For the following code:

struct Bar;
struct Bar;
fn main () {
}

show

error[E0428]: a type named `Bar` has already been defined in this module
--> src/test/compile-fail/E0428.rs:12:1
|
11 | struct Bar;
| ----------- previous definition of `Bar` here
12 | struct Bar;
| ^^^^^^^^^^^
error: aborting due to previous error

instead of

error[E0428]: a type named `Bar` has already been defined in this module
--> src/test/compile-fail/E0428.rs:12:1
|
11 | struct Bar;
| ----------- previous definition of `Bar` here
12 | struct Bar;
| ^^^^^^^^^^^
error[E0428]: a value named `Bar` has already been defined in this module
--> src/test/compile-fail/E0428.rs:12:1
|
11 | struct Bar;
| ----------- previous definition of `Bar` here
12 | struct Bar;
| ^^^^^^^^^^^
error: aborting due to 2 previous errors

Fixes#35767.

rust-highfive · 2016-10-28T07:34:49Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

nrc · 2016-11-07T01:12:06Z

Could you use a hash set rather than a vec here? (O(1) vs O(n)).

estebank · 2016-11-07T04:54:03Z

@nrc makes complete sense. Changed.

nrc · 2016-11-07T08:55:15Z

looks good, thanks!

@bors: r+

bors · 2016-11-07T08:55:16Z

📌 Commit ea9f167 has been approved by nrc

bors · 2016-11-07T10:28:00Z

⌛ Testing commit ea9f167 with merge 7b8fda8...

bors · 2016-11-07T12:13:59Z

💔 Test failed - auto-linux-64-opt-rustbuild

estebank · 2016-11-07T18:47:38Z

@nrc I'm unsure what the error is or how it could have been caused by this patch:

Building stage2 compiler artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
Finished release [optimized] target(s) in 0.18 secs
Building stage2 tool error_index_generator (x86_64-unknown-linux-gnu)
Finished release [optimized] target(s) in 0.0 secs
Testing error-index stage2
thread 'main' panicked at 'entity not found', /buildslave/rust-buildbot/slave/auto-linux-64-opt-rustbuild/build/src/tools/error_index_generator/main.rs:209
note: Run with `RUST_BACKTRACE=1` for a backtrace.
command did not execute successfully: "/buildslave/rust-buildbot/slave/auto-linux-64-opt-rustbuild/build/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/error_index_generator" "markdown" "/buildslave/rust-buildbot/slave/auto-linux-64-opt-rustbuild/build/obj/build/x86_64-unknown-linux-gnu/test/error-index.md"
expected success, got: exit code: 101

What can I do to get a more verbose error in order to fix it?

nrc · 2016-11-07T18:50:54Z

@bors: retry

@estebank I think this is just intermittent failure on the infra, not your patch.

bors · 2016-11-09T23:16:40Z

☔ The latest upstream changes (presumably #37670) made this pull request unmergeable. Please resolve the merge conflicts.

For the following code: ```rustc struct Bar; struct Bar; fn main () { } ``` show ```nocode error[E0428]: a type named `Bar` has already been defined in this module --> src/test/compile-fail/E0428.rs:12:1 | 11 | struct Bar; | ----------- previous definition of `Bar` here 12 | struct Bar; | ^^^^^^^^^^^ error: aborting due to previous error ``` instead of ```nocode error[E0428]: a type named `Bar` has already been defined in this module --> src/test/compile-fail/E0428.rs:12:1 | 11 | struct Bar; | ----------- previous definition of `Bar` here 12 | struct Bar; | ^^^^^^^^^^^ error[E0428]: a value named `Bar` has already been defined in this module --> src/test/compile-fail/E0428.rs:12:1 | 11 | struct Bar; | ----------- previous definition of `Bar` here 12 | struct Bar; | ^^^^^^^^^^^ error: aborting due to 2 previous errors ```

alexcrichton · 2016-11-10T21:28:12Z

@bors: r=nrc

(assuming nothing change, but @nrc feel free to correct me!)

bors · 2016-11-10T21:28:13Z

📌 Commit 43aed32 has been approved by nrc

estebank · 2016-11-10T22:16:34Z

@alexcrichton I only fixed the merge conflicts.

bors · 2016-11-11T13:55:04Z

⌛ Testing commit 43aed32 with merge ba2e892...

Show one error for duplicated type definitions For the following code: ``` rustc struct Bar; struct Bar; fn main () { } ``` show ``` nocode error[E0428]: a type named `Bar` has already been defined in this module --> src/test/compile-fail/E0428.rs:12:1 | 11 | struct Bar; | ----------- previous definition of `Bar` here 12 | struct Bar; | ^^^^^^^^^^^ error: aborting due to previous error ``` instead of ``` nocode error[E0428]: a type named `Bar` has already been defined in this module --> src/test/compile-fail/E0428.rs:12:1 | 11 | struct Bar; | ----------- previous definition of `Bar` here 12 | struct Bar; | ^^^^^^^^^^^ error[E0428]: a value named `Bar` has already been defined in this module --> src/test/compile-fail/E0428.rs:12:1 | 11 | struct Bar; | ----------- previous definition of `Bar` here 12 | struct Bar; | ^^^^^^^^^^^ error: aborting due to 2 previous errors ``` Fixes#35767.

bors · 2016-11-11T17:04:14Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: nrc
Pushing ba2e892 to master...

rust-highfive assigned nrc Oct 28, 2016

estebank force-pushed the non-duplicate-definition-error branch 2 times, most recently from bdf3d24 to 03baeefCompare October 30, 2016 02:59

estebank force-pushed the non-duplicate-definition-error branch 2 times, most recently from 3132180 to ea9f167Compare November 7, 2016 04:49

estebank force-pushed the non-duplicate-definition-error branch from ea9f167 to 43aed32Compare November 10, 2016 00:20

bors mentioned this pull request Nov 11, 2016
trans: Make type names in LLVM IR independent of crate-nums and source locations. #37640
Merged

bors merged commit 43aed32 into rust-lang:masterNov 11, 2016

estebank deleted the non-duplicate-definition-error branch November 9, 2023 05:28

Uh oh!

Uh oh!

Conversation

estebank commented Oct 28, 2016

Uh oh!

rust-highfive commented Oct 28, 2016

Uh oh!

nrc commented Nov 7, 2016

Uh oh!

estebank commented Nov 7, 2016

Uh oh!

nrc commented Nov 7, 2016

Uh oh!

bors commented Nov 7, 2016

Uh oh!

bors commented Nov 7, 2016

Uh oh!

bors commented Nov 7, 2016

Uh oh!

estebank commented Nov 7, 2016

Uh oh!

nrc commented Nov 7, 2016

Uh oh!

bors commented Nov 9, 2016

Uh oh!

alexcrichton commented Nov 10, 2016

Uh oh!

bors commented Nov 10, 2016

Uh oh!

estebank commented Nov 10, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants