Improve dependency deduplication diagnostics#52080
Merged
bors merged 3 commits intorust-lang:masterfrom Jul 6, 2018
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
kennytm
approved these changes
Jul 5, 2018
Member
kennytm
left a comment
kennytm
left a comment
There was a problem hiding this comment.
Some minor nits if you care, otherwise r=me.
src/bootstrap/tool.rs
Outdated
| println!(" `{}` enabled features {:?} at {:?}", | ||
| prev.0, prev.2, prev.1); | ||
| if cur.2 == prev.2 { | ||
| continue; |
Member
There was a problem hiding this comment.
You could use duplicates.drain_filter(...) to avoid the double-checking.
Contributor
Author
There was a problem hiding this comment.
^^ I considered that and then was like oh it's just during failure and copy paste is so convenient. I'll do it anyway.
src/bootstrap/tool.rs
Outdated
| println!(" `{}` additionally enabled features {:?} at {:?}", | ||
| cur.0, cur_extra, cur.1); | ||
| println!(" `{}` additionally enabled features {:?} at {:?}", | ||
| prev.0, prev_extra, prev.1); |
Member
There was a problem hiding this comment.
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);
Contributor
Author
There was a problem hiding this comment.
oh. that's why - didn't work... you need references -.-
Member
|
@bors r+ rollup |
Collaborator
|
📌 Commit f352e98 has been approved by |
bors
added
S-waiting-on-bors
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:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
r? @kennytm
this is obviously hard to test 😆
cc #52072