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.

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

Cosmetic improvements to doc comments #58341

Merged
merged 5 commits into from
Feb 12, 2019

Conversation

alexreg
Copy link
Contributor

@alexreg alexreg commented Feb 10, 2019

This has been factored out from #58036 to only include changes to documentation comments (throughout the rustc codebase).

r? @steveklabnik

Once you're happy with this, maybe we could get it through with r=1, so it doesn't constantly get invalidated? (I'm not sure this will be an issue, but just in case...) Anyway, thanks for your advice so far!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 10, 2019
@rust-highfive

This comment has been minimized.

@@ -66,7 +66,7 @@ impl Step for Rustc {
});
}

/// Build the compiler.
/// Builds the compiler.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this an improvement rather than a random stylistic change?
What will prevent people from using their preferred form again?

=> controversial

Copy link
Contributor Author

@alexreg alexreg Feb 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not controversial at all. This is the standard/conventional style, to use the present tense, and improves consistency too. What prevents this happening again is people like you and me making sure this is used when reviewing PRs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Build the compiler" is also present tense, so that's not even the point here. The difference is about using 2nd or 3rd person singular.

But indeed the majority of doc comments seem to be written in 3rd person.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RalfJung
[ot] I never realized imperative is actually a usual present tense with implicit "you" in English, it's an entirely separate form without a tense in Russian.

Copy link
Member

@RalfJung RalfJung Feb 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah same in German... English just has the most boring verbs.^^

I guess it's actually meant to be imperative here, not 2nd person singular. Whatever.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RalfJung @petrochenkov Well yes, but it's the imperative mood... the issue is so many verb forms are degenerate in English. In any case, the convention seems to be 3rd person singular present indicative. ;-) I.e., "[This function] builds the compiler." This makes sense to me.

@rust-highfive

This comment has been minimized.

@alexreg alexreg force-pushed the cosmetic-2-doc-comments branch from a431544 to 4d7303a Compare February 10, 2019 18:53
@bors
Copy link
Contributor

bors commented Feb 10, 2019

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

@alexreg alexreg force-pushed the cosmetic-2-doc-comments branch from 4d7303a to f438305 Compare February 10, 2019 23:44
@alexreg
Copy link
Contributor Author

alexreg commented Feb 10, 2019

Okay, looks like tests are passing and everything is good to go, in theory...

@alexreg alexreg force-pushed the cosmetic-2-doc-comments branch from f438305 to f943296 Compare February 10, 2019 23:57
@steveklabnik
Copy link
Member

@bors: r+ p=1

Normally, I would not p=1 this, but given that it's very likely to bit-rot and we're splitting up a massive PR, let's do it. I was gonna do a rollup but there are only two other rollup PRs. It's monday morning, this is fine, imho. If someone strongly disagrees feel free to do something else.

@bors
Copy link
Contributor

bors commented Feb 11, 2019

📌 Commit f943296 has been approved by steveklabnik

@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 Feb 11, 2019
@bors
Copy link
Contributor

bors commented Feb 11, 2019

⌛ Testing commit f943296 with merge a0e77211932fce19f61097d2344dd53934f56ac6...

@bors
Copy link
Contributor

bors commented Feb 11, 2019

💔 Test failed - status-appveyor

@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 Feb 11, 2019
@alexreg
Copy link
Contributor Author

alexreg commented Feb 11, 2019

Thanks @steveklabnik. Those were my thoughts too, essentially. It doesn't have the "importance" of a higher-priority PR, but due to the tendency to bitrot, etc. Looks like like an ephemeral failure with bors though, if I'm not mistaken?

@mati865
Copy link
Contributor

mati865 commented Feb 11, 2019

Tracking issue for this failure: #58025

It should work after 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 Feb 11, 2019
@rust-lang rust-lang deleted a comment from bors Feb 11, 2019
@rust-lang rust-lang deleted a comment from bors Feb 11, 2019
@rust-highfive

This comment has been minimized.

@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 Feb 12, 2019
@Centril
Copy link
Contributor

Centril commented Feb 12, 2019

@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 Feb 12, 2019
@bors
Copy link
Contributor

bors commented Feb 12, 2019

⌛ Testing commit f943296 with merge b244f61...

bors added a commit that referenced this pull request Feb 12, 2019
Cosmetic improvements to doc comments

This has been factored out from #58036 to only include changes to documentation comments (throughout the rustc codebase).

r? @steveklabnik

Once you're happy with this, maybe we could get it through with r=1, so it doesn't constantly get invalidated? (I'm not sure this will be an issue, but just in case...) Anyway, thanks for your advice so far!
@bors
Copy link
Contributor

bors commented Feb 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: steveklabnik
Pushing b244f61 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants