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.

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

Improve dependency deduplication diagnostics #52080

Merged
merged 3 commits into from
Jul 6, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 5, 2018

r? @kennytm

this is obviously hard to test 😆

cc #52072

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 5, 2018
Copy link
Member

@kennytm kennytm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor nits if you care, otherwise r=me.

println!(" `{}` enabled features {:?} at {:?}",
prev.0, prev.2, prev.1);
if cur.2 == prev.2 {
continue;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could use duplicates.drain_filter(...) to avoid the double-checking.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ I considered that and then was like oh it's just during failure and copy paste is so convenient. I'll do it anyway.

println!(" `{}` additionally enabled features {:?} at {:?}",
cur.0, cur_extra, cur.1);
println!(" `{}` additionally enabled features {:?} at {:?}",
prev.0, prev_extra, prev.1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 6 lines could be simply

println!("    `{}` additionally enabled features {:?} at {:?}",
         cur.0, &cur_features - &prev_features, cur.1);     
println!("    `{}` additionally enabled features {:?} at {:?}",
         prev.0, &prev_features - &cur_features, prev.1);     

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh. that's why - didn't work... you need references -.-

@kennytm
Copy link
Member

kennytm commented Jul 5, 2018

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 5, 2018

📌 Commit f352e98 has been approved by kennytm

@bors bors 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 Jul 5, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jul 6, 2018
…nnytm

Improve dependency deduplication diagnostics

r? @kennytm

this is obviously hard to test 😆

cc rust-lang#52072
bors added a commit that referenced this pull request Jul 6, 2018
Rollup of 14 pull requests

Successful merges:

 - #51619 (rust: add initial changes to support powerpc64le musl)
 - #51793 (Fix variant background color on hover in search results)
 - #52005 (Update LLVM to bring in a wasm codegen fix)
 - #52016 (Deduplicate error reports for statics)
 - #52019 ([cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD))
 - #52030 (Any docs preposition change)
 - #52031 (Strenghten synchronization in `Arc::is_unique`)
 - #52033 ([Gardening] Update outdated comments: ByVal -> Scalar)
 - #52052 (Make verbose --version show if parallel queries are supported.)
 - #52055 (Include VS 2017 in error message.)
 - #52063 (Add a link to the rustc docs)
 - #52073 (Add a punch card to weird expressions test)
 - #52080 (Improve dependency deduplication diagnostics)
 - #51953 (enable Atomic*.{load,store} for ARMv6-M / MSP430)

Failed merges:
kennytm added a commit to kennytm/rust that referenced this pull request Jul 6, 2018
…nnytm

Improve dependency deduplication diagnostics

r? @kennytm

this is obviously hard to test 😆

cc rust-lang#52072
bors added a commit that referenced this pull request Jul 6, 2018
Rollup of 14 pull requests

Successful merges:

 - #51619 (rust: add initial changes to support powerpc64le musl)
 - #51793 (Fix variant background color on hover in search results)
 - #52005 (Update LLVM to bring in a wasm codegen fix)
 - #52016 (Deduplicate error reports for statics)
 - #52019 ([cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD))
 - #52030 (Any docs preposition change)
 - #52031 (Strenghten synchronization in `Arc::is_unique`)
 - #52033 ([Gardening] Update outdated comments: ByVal -> Scalar)
 - #52055 (Include VS 2017 in error message.)
 - #52063 (Add a link to the rustc docs)
 - #52073 (Add a punch card to weird expressions test)
 - #52080 (Improve dependency deduplication diagnostics)
 - #52093 (rustc: Update tracking issue for wasm_import_module)
 - #52096 (Fix typo in cell.rs)

Failed merges:
@bors bors merged commit f352e98 into rust-lang:master Jul 6, 2018
@oli-obk oli-obk deleted the dep_dedup_diagnostics branch July 11, 2018 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

4 participants