Skip to content

Document ModuleData and improve names - #80425

Merged
bors merged 2 commits into
rust-lang:masterfrom
camelid:resolve-moduledata-docs
Jan 7, 2021
Merged

Document ModuleData and improve names#80425
bors merged 2 commits into
rust-lang:masterfrom
camelid:resolve-moduledata-docs

Conversation

@camelid

@camelidcamelid commented Dec 28, 2020•
edited
Loading

Copy link
Copy Markdown
Member
  • Document ModuleData
  • Rename ModuleData.normal_ancestor_id to nearest_parent_mod
  • Rename Resolver::nearest_mod_parent to nearest_parent_mod

cc https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/mentoring/near/221029702

r? @petrochenkov

@camelidcamelid added A-resolve Area: Name/path resolution done by `rustc_resolve` specifically T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools labels Dec 28, 2020
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2020
@camelid

camelid commented Dec 28, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Rename ModuleData.normal_ancestor_id to closest_parent_mod

There seems to be a function called nearest_mod_parent in resolve; its docs seem to suggest that the result from it would be equivalent to ModuleData.normal_ancestor_id?

Also, perhaps nearest_mod might be a better name?

@camelid
camelidforce-pushed the resolve-moduledata-docs branch from a534373 to ba4c1deCompareDecember 28, 2020 01:01
petrochenkov
petrochenkov reviewed Dec 28, 2020
View reviewed changes
Comment threadcompiler/rustc_resolve/src/lib.rs Outdated
@petrochenkov

petrochenkov commented Dec 28, 2020

Copy link
Copy Markdown
Contributor

The normal_ancestor_id naming is ancient, and I agree that it's very confusing.
closest_parent_mod is a good replacement, nearest_parent_mod might be better, "nearest" seems to be a commonly used work in graph theory (I think it's important to keep "parent").

petrochenkov
petrochenkov reviewed Dec 28, 2020
View reviewed changes
Comment threadcompiler/rustc_resolve/src/lib.rs Outdated
@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 28, 2020
@camelid

camelid commented Dec 28, 2020

Copy link
Copy Markdown
MemberAuthor

closest_parent_mod is a good replacement, nearest_parent_mod might be better, "nearest" seems to be a commonly used work in graph theory (I think it's important to keep "parent").

Will it be confusing if there's ModuleData.nearest_parent_modandResolver::nearest_mod_parent()?

@petrochenkov

petrochenkov commented Dec 28, 2020

Copy link
Copy Markdown
Contributor

nearest_mod_parent can be renamed to nearest_parent_mod too for consistency.

camelid
camelid commented Jan 6, 2021
View reviewed changes
Comment threadcompiler/rustc_resolve/src/lib.rs Outdated
@camelidcamelid changed the title Document ModuleDataDocument ModuleData and improve namesJan 6, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelidcamelid 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 Jan 6, 2021
@camelid
camelidforce-pushed the resolve-moduledata-docs branch from 13f427e to 8edcdb9CompareJanuary 6, 2021 01:12
petrochenkov
petrochenkov reviewed Jan 6, 2021
View reviewed changes
Comment threadcompiler/rustc_resolve/src/lib.rs Outdated
@petrochenkov

petrochenkov commented Jan 6, 2021

Copy link
Copy Markdown
Contributor

r=me after squashing commits.

@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 6, 2021
@camelid
camelidforce-pushed the resolve-moduledata-docs branch from dce53a7 to f0598e5CompareJanuary 6, 2021 20:40
@camelid

camelid commented Jan 6, 2021

Copy link
Copy Markdown
MemberAuthor

Rebased.

@camelid
Document ModuleData
0693198
* Convert comments on fields to doc comments so they're visible in API
docs
* Add new documentation
* Get rid of "normal module" terminology
@petrochenkov

petrochenkov commented Jan 6, 2021

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 6, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 5c86c223ee890dbdfd136e8eb9f0a404bc9a88bf has been approved by petrochenkov

@borsbors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 6, 2021
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 6, 2021
@camelid

camelid commented Jan 6, 2021

Copy link
Copy Markdown
MemberAuthor

Oh, I was about to push up squashed commits. Do you still want me to do that?

@camelid
Rename to nearest_parent_mod
ff75da8
* Rename `ModuleData.normal_ancestor_id` to `nearest_parent_mod`
`normal_ancestor_id` is a very confusing name if you don't already
understand what it means. Adding docs helps, but using a clearer and
more obvious name is also important.
* Rename `Resolver::nearest_mod_parent` to `nearest_parent_mod`
* Add more docs
@petrochenkov

petrochenkov commented Jan 6, 2021

Copy link
Copy Markdown
Contributor

Yes, please push.
@bors r-

@borsbors 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 Jan 6, 2021
@camelid
camelidforce-pushed the resolve-moduledata-docs branch from 5c86c22 to ff75da8CompareJanuary 6, 2021 20:56
@camelid

camelid commented Jan 6, 2021

Copy link
Copy Markdown
MemberAuthor

Squashed.

@petrochenkov

petrochenkov commented Jan 6, 2021

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 6, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit ff75da8 has been approved by petrochenkov

@borsbors 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 Jan 6, 2021
@bors

bors commented Jan 7, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ff75da8 with merge 5b3d524...

@bors

bors commented Jan 7, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 5b3d524 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 7, 2021
@bors
bors merged commit 5b3d524 into rust-lang:masterJan 7, 2021
@rustbotrustbot added this to the 1.51.0 milestone Jan 7, 2021
This was referenced Jan 7, 2021
Closed
Merged
@camelid
camelid deleted the resolve-moduledata-docs branch January 7, 2021 20:55
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

Labels

A-docsArea: Documentation for any part of the project, including the compiler, standard library, and toolsA-resolveArea: Name/path resolution done by `rustc_resolve` specificallymerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.51.0

Development

Successfully merging this pull request may close these issues.

6 participants

@camelid@petrochenkov@rust-log-analyzer@bors@rust-highfive@rustbot