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

split select into submodules #72586

Merged
merged 4 commits into from
Jun 3, 2020
Merged

split select into submodules #72586

merged 4 commits into from
Jun 3, 2020

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 25, 2020 •
edited
Loading

rust/src/librustc_trait_selection/traits/select.rs

Line 1 in a0f06d1

// ignore-tidy-filelength

I extracted two submodules:

  • confirmation: apart from pub(super) fn confirm_candidate, everything else is private
  • candidate_assembly: exports pub(super) fn candidate_from_obligation and pub(super) fn assemble_candidates

I tried to change as little as possible while doing this and hopefully split this into well reviewable commits.

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 25, 2020
@petrochenkov
Copy link
Contributor

r? @nikomatsakis
https://rust-lang.zulipchat.com/#narrow/stream/144729-wg-traits/topic/Review.20for.20.22split.20select.20into.20submodules.22

@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 26, 2020

📌 Commit ba5f0f1be50e4faa3c677015a8e431553c33fc8a has been approved by nikomatsakis

@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 May 26, 2020
@nikomatsakis
Copy link
Contributor

@bors rollup-

maybe this is too conflict prone

@bors
Copy link
Contributor

bors commented May 28, 2020

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

@bors bors 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 May 28, 2020
@lcnr lcnr force-pushed the winner-winnowing branch from ba5f0f1 to 0a6ce60 Compare May 28, 2020 07:05
@lcnr
Copy link
Contributor Author

lcnr commented May 28, 2020

Rebased, should once again be ready for merge

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 28, 2020

📌 Commit 0a6ce604975a2c2f6c0ae23a4d2da1c1d82008a4 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2020
@bors
Copy link
Contributor

bors commented May 30, 2020

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

@bors bors 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 May 30, 2020
@lcnr lcnr force-pushed the winner-winnowing branch from 0a6ce60 to 9b1e3cd Compare May 30, 2020 12:23
@bors
Copy link
Contributor

bors commented May 30, 2020

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

@lcnr lcnr force-pushed the winner-winnowing branch from 9b1e3cd to a5d2668 Compare May 30, 2020 16:59
@lcnr
Copy link
Contributor Author

lcnr commented May 30, 2020

Rebased, should once again be ready for merge

@lcnr lcnr added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 1, 2020
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2020
@jonas-schievink
Copy link
Contributor

@bors retry

@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 Jun 2, 2020
@bors
Copy link
Contributor

bors commented Jun 2, 2020

⌛ Testing commit a5d2668d6db6e180461966b0dbe8fe64573cc6bd with merge 9b00e6ec73ecb1c97b9467c0635536d351f103e3...

@bors
Copy link
Contributor

bors commented Jun 3, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 3, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Jun 3, 2020

Afaict only Windows i686-mingw-1 failed...

Looking at the raw output... these snippets seem to be relevant, if unrelated to this PR:

2020-06-03T00:00:38.5324024Z Invoking msys2 shell command: -defterm -no-start -c "ps -ef | grep '[?]' | awk '{print $2}' | xargs -r kill"
2020-06-03T00:00:38.6865418Z mkdir: cannot change permissions of '/dev/shm': Permission denied
2020-06-03T00:00:38.6991154Z mkdir: cannot change permissions of '/dev/mqueue': Permission denied


2020-06-03T00:01:07.9614303Z ###################################################################
2020-06-03T00:01:07.9614638Z #                                                                 #
2020-06-03T00:01:07.9615014Z #                                                                 #
2020-06-03T00:01:07.9615335Z #                   C   A   U   T   I   O   N                     #
2020-06-03T00:01:07.9617067Z #                                                                 #
2020-06-03T00:01:07.9617434Z #                  This is first start of MSYS2.                  #
2020-06-03T00:01:07.9617864Z #       You MUST restart shell to apply necessary actions.        #
2020-06-03T00:01:07.9618228Z #                                                                 #
2020-06-03T00:01:07.9618548Z #                                                                 #
2020-06-03T00:01:07.9618918Z ###################################################################



2020-06-03T00:01:15.0503132Z       0 [main] bash (4656) D:\a\1\s\msys2\usr\bin\bash.exe: *** fatal error - cygheap base mismatch detected - 0x180330408/0x180346408.
2020-06-03T00:01:15.0504511Z This problem is probably due to using incompatible versions of the cygwin DLL.



2020-06-03T00:03:25.3015568Z + rm download-src-doc-book.tar.gz
2020-06-03T00:03:25.3317445Z error: could not lock config file .git/modules/src/doc/edition-guide/config: No such file or directory


2020-06-03T00:05:44.7396921Z Attempting with retry: make prepare
2020-06-03T00:05:45.2840610Z downloading https://static.rust-lang.org/dist/2020-04-22/rust-std-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:05:49.7775566Z extracting D:\a\1\s\build\cache\2020-04-22\rust-std-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:05:50.1180090Z downloading https://static.rust-lang.org/dist/2020-04-22/rustc-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:10.8730339Z extracting D:\a\1\s\build\cache\2020-04-22\rustc-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:11.2194470Z downloading https://static.rust-lang.org/dist/2020-04-22/rust-mingw-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:13.0653145Z extracting D:\a\1\s\build\cache\2020-04-22\rust-mingw-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:13.4203770Z downloading https://static.rust-lang.org/dist/2020-04-22/cargo-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:15.9333299Z extracting D:\a\1\s\build\cache\2020-04-22\cargo-beta-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:16.3000218Z downloading https://static.rust-lang.org/dist/2020-04-22/rustfmt-nightly-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:18.9572549Z extracting D:\a\1\s\build\cache\2020-04-22\rustfmt-nightly-i686-pc-windows-gnu.tar.xz
2020-06-03T00:06:20.2241435Z     Updating crates.io index
2020-06-03T00:06:39.5027447Z error: failed to get `cc` as a dependency of package `bootstrap v0.0.0 (D:\a\1\s\src\bootstrap)`
2020-06-03T00:06:39.5028100Z 
2020-06-03T00:06:39.5044855Z Caused by:
2020-06-03T00:06:39.5064607Z   failed to fetch `https://github.com/rust-lang/crates.io-index`
2020-06-03T00:06:39.5098202Z 
2020-06-03T00:06:39.5098465Z Caused by:
2020-06-03T00:06:39.5098664Z   error inflating zlib stream; class=Zlib (5)
2020-06-03T00:06:39.5143192Z failed to run: D:\a\1\s\build\i686-pc-windows-gnu\stage0\bin\cargo.exe build --manifest-path D:\a\1\s\src/bootstrap/Cargo.toml --locked

@jonas-schievink
Copy link
Contributor

@bors retry

@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 Jun 3, 2020
@bors
Copy link
Contributor

bors commented Jun 3, 2020

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

@bors bors 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 Jun 3, 2020
@lcnr lcnr force-pushed the winner-winnowing branch from a5d2668 to b280264 Compare June 3, 2020 12:55
@lcnr
Copy link
Contributor Author

lcnr commented Jun 3, 2020

Should once again be ready 😅

@jonas-schievink
Copy link
Contributor

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 3, 2020

📌 Commit b280264 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 3, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 3, 2020
@bors
Auto merge of rust-lang#72948 - Dylan-DPC:rollup-fazhw00, r=Dylan-DPC
56daaf6 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#72586 (split select into submodules)
 - rust-lang#72900 (Don't count pathless --extern for unused-crate-dependencies warnings)
 - rust-lang#72924 (Stabilize `std::io::Buf{Reader, Writer}::capacity`)
 - rust-lang#72942 (clean up E0641 explanation)
 - rust-lang#72945 (Updated documentation for Control Flow Guard)

Failed merges:

r? @ghost
@bors bors merged commit f94c0df into rust-lang:master Jun 3, 2020
@lcnr lcnr deleted the winner-winnowing branch June 3, 2020 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

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.
6 participants
@lcnr @rust-highfive @petrochenkov @nikomatsakis @bors @jonas-schievink