Skip to content

Doc: Extend for tuples to be stabilized in 1.85.0 - #134022

Merged
bors merged 1 commit into
rust-lang:masterfrom
shahn:doc_clarify_extend_for_tuple_version
Dec 15, 2024
Merged

Doc: Extend for tuples to be stabilized in 1.85.0#134022
bors merged 1 commit into
rust-lang:masterfrom
shahn:doc_clarify_extend_for_tuple_version

Conversation

@shahn

@shahn shahn commented Dec 8, 2024

Copy link
Copy Markdown
Contributor

I assumed the RUSTC_CURRENT_VERSION would be replaced automatically, but it doesn't look like it on the nightly docs page. Sorry!

@rustbot

rustbot commented Dec 8, 2024

Copy link
Copy Markdown
Collaborator

r? @joboet

rustbot has assigned @joboet.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Dec 8, 2024
@workingjubilee

Copy link
Copy Markdown
Member

It was supposed to be CURRENT_RUSTC_VERSION, and the replacement is done when we promote nightly to beta.

@shahn

shahn commented Dec 8, 2024

Copy link
Copy Markdown
Contributor Author

Oh, ooops. Now it makes more sense why I found only a single occurence of RUSTC_CURRENT_VERSION after the merge. Should I leave this PR as is or should I change it to CURRENT_RUSTC_VERSION?

@tgross35

Copy link
Copy Markdown
Member

Since #132187 is destined for 1.85 which is the current nightly, you can just change it to CURRENT_RUSTC_VERSION

Comment thread library/core/src/iter/traits/collect.rs Outdated
@shahn
shahn force-pushed the doc_clarify_extend_for_tuple_version branch from 238775d to bfd2bc3 Compare December 14, 2024 14:34
@shahn

shahn commented Dec 14, 2024

Copy link
Copy Markdown
Contributor Author

Hope it's OK now :)

Comment thread library/core/src/iter/traits/collect.rs Outdated
Comment on lines +506 to +507
#[doc = "This trait is implemented for tuples up to twelve items long. The `impl`s for\
1- and 3- through 12-ary tuples were stabilized after 2-tuples, in\

ghost Dec 14, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

All whitespace after \ gets stripped so these need a space before \, otherwise it gets smooshed together ("impls for1- and 3-" and "2-tuples, inCURRENT_RUSTC_VERSION.")

Comment thread library/core/src/iter/traits/collect.rs
@tgross35

ghost commented Dec 14, 2024

Copy link
Copy Markdown
Member

Hope it's OK now :)

Significantly, thanks :)

Two more nits above then lgtm.

@tgross35

ghost commented Dec 14, 2024

Copy link
Copy Markdown
Member

Also - I appreciate the credit (certainly not needed, minor suggestions are usually without attribution requirements) but small request, could you drop the GH username from the commit message? We found out the hard way that github is pretty overzealous with notifications otherwise and will ping every time somebody applies this commit to a fork 😆

@shahn
shahn force-pushed the doc_clarify_extend_for_tuple_version branch from bfd2bc3 to cdb72a2 Compare December 14, 2024 20:39
I mixed it up with RUSTC_CURRENT_VERSION unfortunately. Also improve the
formatting of the macro invocation slightly.
@shahn
shahn force-pushed the doc_clarify_extend_for_tuple_version branch from cdb72a2 to 7717df2 Compare December 14, 2024 20:40
@shahn

ghost commented Dec 14, 2024

Copy link
Copy Markdown
Contributor Author

Oh ouch, that's annoying about the notifications. I did not mean to spam you of course, dropped the username. And thanks for the fast review!

ghost left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

No worries, it's GitHub's problem not yours :) Thanks for the changes!

@tgross35

ghost commented Dec 14, 2024

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

ghost commented Dec 14, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 7717df2 has been approved by tgross35

It is now in the queue for this repository.

@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 Dec 14, 2024
@tgross35 tgross35 assigned tgross35 and unassigned joboet Dec 14, 2024
@bors
bors merged commit 9b99055 into rust-lang:master Dec 15, 2024
@rustbot rustbot added this to the 1.85.0 milestone Dec 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants