resolve: Some module-related refactorings by petrochenkov · Pull Request #88872 · rust-lang/rust

petrochenkov · 2021-09-12T00:12:47Z

See the individual commits.

rust-highfive · 2021-09-12T00:12:49Z

Some changes occurred in intra-doc-links.

cc @jyn514

rust-highfive · 2021-09-12T00:12:50Z

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

cjgillot · 2021-09-12T11:13:22Z

The ModuleData::new used to set no_implicit_module to false. What are the consequences of this change in behaviour?

For enums and traits there should be no consequences (we are jumping out of these modules during resolution and don't use their no_implicit_prelude flags), for foreign modules there may be some effect on macros 2.0 - identifiers from macros with def-site located in a foreign no_implicit_prelude module should now skip prelude during resolution.
However, because the #[no_implicit_prelude] attributes are still not applied to foreign modules the inherited value is always false, so no change in behavior right now.

petrochenkov · 2021-09-15T21:26:13Z

I've included #88917 into this PR as well.

cjgillot · 2021-09-18T13:04:01Z

@bors r+

bors · 2021-09-18T13:04:03Z

📌 Commit fd23c8348d27dbfe45916094306672a39c4c7e4a has been approved by cjgillot

bors · 2021-09-22T12:54:26Z

⌛ Testing commit fd23c8348d27dbfe45916094306672a39c4c7e4a with merge 76a61b10ee24d792ad456dcb526d716df8833711...

petrochenkov · 2021-09-22T20:10:28Z

r? @cjgillot
@bors r=cjgillot

bors · 2021-09-22T20:10:29Z

📌 Commit 61267440bbba0c29ef89e7bf988f77ab4a5abf16 has been approved by cjgillot

bors · 2021-09-24T14:41:56Z

⌛ Testing commit 61267440bbba0c29ef89e7bf988f77ab4a5abf16 with merge 691dbccc3a019db5ce6b6d31f8216b37bef09e9e...

Construction of all modules is now centralized and performed by `fn new_module`.

The `Option<Module>` version is supported for the case where we don't know whether the `DefId` refers to a module or not. Non-local traits and enums are also correctly found now.

petrochenkov · 2021-09-24T17:29:45Z

@bors r=cjgillot

bors · 2021-09-24T17:29:46Z

📌 Commit 8f035b8 has been approved by cjgillot

bors · 2021-09-24T18:12:37Z

⌛ Testing commit 8f035b8 with merge 7342213...

bors · 2021-09-24T21:02:43Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 7342213 to master...

rust-timer · 2021-09-25T02:16:09Z

Finished benchmarking commit (7342213): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

resolve: Cache module loading for all foreign modules It was previously cached for modules loaded from `fn get_module`, but not for modules loaded from `fn build_reduced_graph_for_external_crate_res`. This also makes all foreign modules use their real parent, span and expansion instead of possibly a parent/span/expansion of their reexport. Modules are also often compared using referential equality (`ptr::eq`), this change makes such comparisons correct in all cases. An ICE happening on attempt to decode expansions for foreign enums and traits is avoided. Also local enums and traits are now added to the module map. Follow up to rust-lang#88872. r? `@cjgillot`

rust-highfive assigned matthewjasper Sep 12, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 12, 2021

petrochenkov force-pushed the getmod2 branch from ec5dbc2 to 7e407f9Compare September 12, 2021 00:14

petrochenkov mentioned this pull request Sep 12, 2021
rustdoc: Pre-calculate traits that are in scope for doc links #88679
Merged

cjgillot reviewed Sep 12, 2021
View reviewed changes

petrochenkov force-pushed the getmod2 branch from 7e407f9 to fd23c83Compare September 15, 2021 21:25

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 Sep 18, 2021

This comment has been minimized.
Sign in to view

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 Sep 22, 2021

petrochenkov force-pushed the getmod2 branch from fd23c83 to 6126744Compare September 22, 2021 20:09

rust-highfive assigned cjgillot and unassigned matthewjasper Sep 22, 2021

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 Sep 22, 2021

This comment has been minimized.
Sign in to view

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 24, 2021

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 24, 2021

This comment has been minimized.
Sign in to view

petrochenkov added 5 commits September 24, 2021 18:57

resolve: Do not cache nearest parent mod in ModuleData
fd58eea

resolve: Cleanup module allocation
6e9adcb
Construction of all modules is now centralized and performed by `fn new_module`.

resolve: Rename some expansion def scope methods
1a23858

resolve: Use a single common map for local and foreign modules
a802188

resolve: Refactor obtaining Module from its DefId
ab834e5
The `Option<Module>` version is supported for the case where we don't know whether the `DefId` refers to a module or not. Non-local traits and enums are also correctly found now.

petrochenkov mentioned this pull request Sep 24, 2021
Test src\test\rustdoc\macro-document-private-duplicate.rs fails spuriously #89228
Open

Disable a spuriously failing test
8f035b8

petrochenkov force-pushed the getmod2 branch from 6126744 to 8f035b8Compare September 24, 2021 17:29

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 Sep 24, 2021

bors mentioned this pull request Sep 24, 2021
Rollup of 8 pull requests #89226
Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2021

bors merged commit 7342213 into rust-lang:masterSep 24, 2021

rustbot added this to the 1.57.0 milestone Sep 24, 2021

petrochenkov mentioned this pull request Sep 25, 2021
resolve: Cache module loading for all foreign modules #89239
Merged

gurry mentioned this pull request Dec 3, 2023
ice: ProjectionKinds Deref and Field were mismatched#118144
Closed

petrochenkov deleted the getmod2 branch February 22, 2025 18:31

Uh oh!

Uh oh!

Conversation

petrochenkov commented Sep 12, 2021

Uh oh!

rust-highfive commented Sep 12, 2021

Uh oh!

rust-highfive commented Sep 12, 2021

Uh oh!

Uh oh!

cjgillotSep 12, 2021

Choose a reason for hiding this comment

Uh oh!

petrochenkovSep 12, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

petrochenkov commented Sep 15, 2021

Uh oh!

cjgillot commented Sep 18, 2021

Uh oh!

bors commented Sep 18, 2021

Uh oh!

bors commented Sep 22, 2021

Uh oh!

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Sep 22, 2021

Uh oh!

bors commented Sep 22, 2021

Uh oh!

bors commented Sep 24, 2021

Uh oh!

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Sep 24, 2021

Uh oh!

bors commented Sep 24, 2021

Uh oh!

bors commented Sep 24, 2021

Uh oh!

bors commented Sep 24, 2021

Uh oh!

rust-timer commented Sep 25, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants