resolve: Populate external modules in more automatic and lazy way #63149

petrochenkov · 2019-07-30T20:46:00Z

So, resolve had this function populate_module_if_necessary for loading module children from other crates from metadata.
I never really understood when it should've been called and when not.
This PR removes the function and loads the module children automatically on the first access instead.

r? @eddyb

petrochenkov · 2019-07-30T20:46:24Z

@bors try

bors · 2019-07-30T20:46:35Z

⌛ Trying commit 2245577 with merge ac89e03...

@eddyb

resolve: Populate external modules in more automatic and lazy way So, resolve had this function `populate_module_if_necessary` for loading module children from other crates from metadata. I never really understood when it should've been called and when not. This PR removes the function and loads the module children automatically on the first access instead. r? @eddyb

petrochenkov · 2019-07-31T09:25:56Z

Hmm, no notification, but looks like the build completed successfully.
@rust-timer build ac89e03

rust-timer · 2019-07-31T09:25:57Z

Success: Queued ac89e03 with parent f690098, comparison URL.

rust-timer · 2019-07-31T11:18:01Z

Finished benchmarking try commit ac89e03, comparison URL.

petrochenkov · 2019-07-31T13:02:30Z

Ok, perf looks mostly like a noise, but the change still makes sense logically.

wirelessringo · 2019-08-09T08:25:02Z

Ping from triage. @eddyb any updates on this? Thanks.

eddyb · 2019-08-09T16:56:14Z

@bors r+

bors · 2019-08-09T16:56:16Z

📌 Commit cbaf397804be470b1fec12c5bfe0c7edcd923199 has been approved by eddyb

bors · 2019-08-09T18:45:09Z

⌛ Testing commit cbaf397804be470b1fec12c5bfe0c7edcd923199 with merge 047f9faa888b1117a85cbce106d866273c80008a...

bors · 2019-08-09T18:56:59Z

💔 Test failed - checks-azure

rust-highfive · 2019-08-09T18:56:59Z

The job mingw-check of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-08-09T18:46:29.5461739Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-09T18:46:29.5461926Z 
2019-08-09T18:46:29.5462310Z   git checkout -b <new-branch-name>
2019-08-09T18:46:29.5462511Z 
2019-08-09T18:46:29.5462941Z HEAD is now at 047f9faa8 Auto merge of #63149 - petrochenkov:lazypop2, r=eddyb
2019-08-09T18:46:29.5629402Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-09T18:46:29.5632337Z ==============================================================================
2019-08-09T18:46:29.5632443Z Task         : Bash
2019-08-09T18:46:29.5632525Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-09T18:54:39.9359151Z     Checking rustc_ast_borrowck v0.0.0 (/checkout/src/librustc_ast_borrowck)
2019-08-09T18:54:41.1093100Z     Checking rustc_codegen_utils v0.0.0 (/checkout/src/librustc_codegen_utils)
2019-08-09T18:54:41.6917094Z     Checking rustc_plugin v0.0.0 (/checkout/src/librustc_plugin)
2019-08-09T18:54:41.9702335Z     Checking rustc_resolve v0.0.0 (/checkout/src/librustc_resolve)
2019-08-09T18:54:43.2198530Z error[E0599]: no variant or associated item named `AssocExistential` found for type `rustc::hir::def::DefKind` in the current scope
2019-08-09T18:54:43.2204323Z    --> src/librustc_resolve/build_reduced_graph.rs:665:33
2019-08-09T18:54:43.2210247Z     |
2019-08-09T18:54:43.2211591Z 665 |             | Res::Def(DefKind::AssocExistential, _)
2019-08-09T18:54:43.2217825Z     |                                 ^^^^^^^^^^^^^^^^ variant or associated item not found in `rustc::hir::def::DefKind`
2019-08-09T18:54:43.4002363Z error: aborting due to previous error
2019-08-09T18:54:43.4002501Z 
2019-08-09T18:54:43.4003124Z For more information about this error, try `rustc --explain E0599`.
2019-08-09T18:54:43.4188001Z error: Could not compile `rustc_resolve`.
2019-08-09T18:54:43.4188001Z error: Could not compile `rustc_resolve`.
2019-08-09T18:54:43.4188400Z warning: build failed, waiting for other jobs to finish...
2019-08-09T18:54:53.7419786Z error: build failed
2019-08-09T18:54:53.7446416Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
2019-08-09T18:54:53.7447144Z expected success, got: exit code: 101
2019-08-09T18:54:53.7456765Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-08-09T18:54:53.7457172Z Build completed unsuccessfully in 0:05:36
2019-08-09T18:54:55.0424325Z ##[error]Bash exited with code '1'.
2019-08-09T18:54:55.0455823Z ##[section]Starting: Upload CPU usage statistics
2019-08-09T18:54:55.0458957Z ==============================================================================
2019-08-09T18:54:55.0459055Z Task         : Bash
2019-08-09T18:54:55.0459430Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

petrochenkov · 2019-08-09T21:24:39Z

@bors r=eddyb

bors · 2019-08-09T21:24:40Z

📌 Commit 2cb9207 has been approved by eddyb

@eddyb

resolve: Populate external modules in more automatic and lazy way So, resolve had this function `populate_module_if_necessary` for loading module children from other crates from metadata. I never really understood when it should've been called and when not. This PR removes the function and loads the module children automatically on the first access instead. r? @eddyb

petrochenkov · 2019-08-11T19:20:46Z

No, not a rebase, the previous error was the same.
Looks like either randomly changing or platform-dependent diagnostics.

Mark-Simulacrum · 2019-08-11T19:26:00Z

(To be clear, I'm not positive that this PR was the cause of that failure, it's just my best guess. Feel free to re-r+ if you feel confident).

bors · 2019-08-12T12:45:58Z

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

petrochenkov · 2019-08-15T22:26:15Z

Span changes causing issues with diagnostics reproducibility are backed out.

@bors r=eddyb

bors · 2019-08-15T22:26:16Z

📌 Commit 4331bf51c440d1d8a862d0777a0984ecf488851c has been approved by eddyb

bors · 2019-08-16T10:43:46Z

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

The modules are now populated implicitly on the first access

Move some code into `build_reduced_graph.rs` to keep `BuildReducedGraphVisitor` it private Also move the def collector call to `build_reduced_graph.rs`, it belongs there.

petrochenkov · 2019-08-16T18:28:59Z

@bors r=eddyb

bors · 2019-08-16T18:29:01Z

📌 Commit 5e47cd4 has been approved by eddyb

@eddyb

resolve: Populate external modules in more automatic and lazy way So, resolve had this function `populate_module_if_necessary` for loading module children from other crates from metadata. I never really understood when it should've been called and when not. This PR removes the function and loads the module children automatically on the first access instead. r? @eddyb

@eddyb

resolve: Populate external modules in more automatic and lazy way So, resolve had this function `populate_module_if_necessary` for loading module children from other crates from metadata. I never really understood when it should've been called and when not. This PR removes the function and loads the module children automatically on the first access instead. r? @eddyb

@ghost

Rollup of 6 pull requests Successful merges: - #63149 (resolve: Populate external modules in more automatic and lazy way) - #63545 (Feature gate 'yield $expr?' pre-expansion) - #63548 (Update rustc-demangle to 0.1.16.) - #63558 (Remap paths for proc-macro crates.) - #63641 (add git keyword to submodule comments in config.example.toml) - #63642 (Rename overflowing_{add,sub,mul} intrinsics to wrapping_{add,sub,mul}.) Failed merges: r? @ghost

petrochenkov assigned eddyb Jul 30, 2019

petrochenkov added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 30, 2019

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jul 31, 2019

petrochenkov force-pushed the lazypop2 branch from d2fd5f9 to cbaf397 Compare July 31, 2019 18:26

eddyb approved these changes Aug 9, 2019

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 Aug 9, 2019

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 Aug 9, 2019

petrochenkov force-pushed the lazypop2 branch from cbaf397 to 2cb9207 Compare August 9, 2019 21:24

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 Aug 9, 2019

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 Aug 11, 2019

petrochenkov force-pushed the lazypop2 branch from a087df6 to 4331bf5 Compare August 15, 2019 22:24

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 Aug 15, 2019

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 Aug 16, 2019

petrochenkov added 4 commits August 16, 2019 21:10

resolve: Populate external modules in more automatic and lazy way

ea81d8c

The modules are now populated implicitly on the first access

resolve: Populate external traits lazily as well

fe2524c

resolve: Move some code around

ab4cc2d

Fix rebase

5e47cd4

Move some code into `build_reduced_graph.rs` to keep `BuildReducedGraphVisitor` it private Also move the def collector call to `build_reduced_graph.rs`, it belongs there.

petrochenkov force-pushed the lazypop2 branch from 4331bf5 to 5e47cd4 Compare August 16, 2019 18:28

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 Aug 16, 2019

Centril mentioned this pull request Aug 16, 2019

Rollup of 7 pull requests #63644

Closed

Centril mentioned this pull request Aug 17, 2019

Rollup of 6 pull requests #63648

Merged

bors merged commit 5e47cd4 into rust-lang:master Aug 17, 2019

petrochenkov mentioned this pull request Oct 15, 2019

tuple variant error message is confusing #65386

Closed

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resolve: Populate external modules in more automatic and lazy way #63149

resolve: Populate external modules in more automatic and lazy way #63149

petrochenkov commented Jul 30, 2019

petrochenkov commented Jul 30, 2019

bors commented Jul 30, 2019

petrochenkov commented Jul 31, 2019

rust-timer commented Jul 31, 2019

rust-timer commented Jul 31, 2019

petrochenkov commented Jul 31, 2019

wirelessringo commented Aug 9, 2019

eddyb commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

rust-highfive commented Aug 9, 2019

petrochenkov commented Aug 9, 2019

bors commented Aug 9, 2019

petrochenkov commented Aug 11, 2019

Mark-Simulacrum commented Aug 11, 2019

bors commented Aug 12, 2019

petrochenkov commented Aug 15, 2019

bors commented Aug 15, 2019

bors commented Aug 16, 2019

petrochenkov commented Aug 16, 2019

bors commented Aug 16, 2019

resolve: Populate external modules in more automatic and lazy way #63149

resolve: Populate external modules in more automatic and lazy way #63149

Conversation

petrochenkov commented Jul 30, 2019

petrochenkov commented Jul 30, 2019

bors commented Jul 30, 2019

petrochenkov commented Jul 31, 2019

rust-timer commented Jul 31, 2019

rust-timer commented Jul 31, 2019

petrochenkov commented Jul 31, 2019

wirelessringo commented Aug 9, 2019

eddyb commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

rust-highfive commented Aug 9, 2019

petrochenkov commented Aug 9, 2019

bors commented Aug 9, 2019

petrochenkov commented Aug 11, 2019

Mark-Simulacrum commented Aug 11, 2019

bors commented Aug 12, 2019

petrochenkov commented Aug 15, 2019

bors commented Aug 15, 2019

bors commented Aug 16, 2019

petrochenkov commented Aug 16, 2019

bors commented Aug 16, 2019