split select into submodules #72586

lcnr · 2020-05-25T20:49:26Z

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 · 2020-05-25T20:49:29Z

r? @petrochenkov

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

petrochenkov · 2020-05-26T21:08:01Z

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

nikomatsakis · 2020-05-26T21:29:24Z

@bors r+ rollup

bors · 2020-05-26T21:29:25Z

📌 Commit ba5f0f1be50e4faa3c677015a8e431553c33fc8a has been approved by nikomatsakis

nikomatsakis · 2020-05-26T21:29:36Z

@bors rollup-

maybe this is too conflict prone

bors · 2020-05-28T04:01:12Z

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

lcnr · 2020-05-28T07:55:32Z

Rebased, should once again be ready for merge

nikomatsakis · 2020-05-28T16:54:06Z

@bors r+

bors · 2020-05-28T16:54:08Z

📌 Commit 0a6ce604975a2c2f6c0ae23a4d2da1c1d82008a4 has been approved by nikomatsakis

bors · 2020-05-30T11:45:16Z

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

bors · 2020-05-30T16:52:08Z

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

lcnr · 2020-05-30T17:01:16Z

Rebased, should once again be ready for merge

jonas-schievink · 2020-06-02T17:59:09Z

@bors retry

bors · 2020-06-02T23:56:46Z

⌛ Testing commit a5d2668d6db6e180461966b0dbe8fe64573cc6bd with merge 9b00e6ec73ecb1c97b9467c0635536d351f103e3...

bors · 2020-06-03T00:10:43Z

💔 Test failed - checks-azure

lcnr · 2020-06-03T08:50:29Z

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 · 2020-06-03T09:20:47Z

@bors retry

bors · 2020-06-03T12:35:59Z

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

lcnr · 2020-06-03T14:07:24Z

Should once again be ready 😅

jonas-schievink · 2020-06-03T14:09:12Z

@bors r=nikomatsakis

bors · 2020-06-03T14:09:13Z

📌 Commit b280264 has been approved by nikomatsakis

@ghost

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

rust-highfive assigned petrochenkov May 25, 2020

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

rust-highfive assigned nikomatsakis and unassigned petrochenkov May 26, 2020

nikomatsakis approved these changes May 26, 2020

View reviewed changes

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

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 force-pushed the winner-winnowing branch from ba5f0f1 to 0a6ce60 Compare May 28, 2020 07:05

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

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

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 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2020

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

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 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 added 4 commits June 3, 2020 14:49

move select into subfolder

634977f

move candidate assembly into a submodule

b8172ec

move confirmation into submodule

bf5c62d

remove ignore-tidy-filelength

b280264

lcnr force-pushed the winner-winnowing branch from a5d2668 to b280264 Compare June 3, 2020 12:55

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 mentioned this pull request Jun 3, 2020

Rollup of 5 pull requests #72948

Merged

bors merged commit f94c0df into rust-lang:master Jun 3, 2020

lcnr deleted the winner-winnowing branch June 3, 2020 20:05

split select into submodules #72586

split select into submodules #72586

Uh oh!

Conversation

lcnr commented May 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented May 25, 2020

Uh oh!

petrochenkov commented May 26, 2020

Uh oh!

nikomatsakis commented May 26, 2020

Uh oh!

bors commented May 26, 2020

Uh oh!

nikomatsakis commented May 26, 2020

Uh oh!

bors commented May 28, 2020

Uh oh!

lcnr commented May 28, 2020

Uh oh!

nikomatsakis commented May 28, 2020

Uh oh!

bors commented May 28, 2020

Uh oh!

bors commented May 30, 2020

Uh oh!

bors commented May 30, 2020

Uh oh!

lcnr commented May 30, 2020

Uh oh!

jonas-schievink commented Jun 2, 2020

Uh oh!

bors commented Jun 2, 2020

Uh oh!

bors commented Jun 3, 2020

Uh oh!

lcnr commented Jun 3, 2020

Uh oh!

jonas-schievink commented Jun 3, 2020

Uh oh!

bors commented Jun 3, 2020

Uh oh!

lcnr commented Jun 3, 2020

Uh oh!

jonas-schievink commented Jun 3, 2020

Uh oh!

bors commented Jun 3, 2020

Uh oh!

Uh oh!

lcnr commented May 25, 2020 •

edited

Loading