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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Dec 15, 2024
Merged

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

merged 1 commit into from
Dec 15, 2024
+56 −7

Conversation

shahn
Copy link
Contributor

@shahn shahn commented Dec 8, 2024

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

@rustbot
Copy link
Collaborator

rustbot commented Dec 8, 2024

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
Member

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

@shahn
Copy link
Contributor Author

shahn commented Dec 8, 2024

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
Contributor

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

@shahn shahn force-pushed the doc_clarify_extend_for_tuple_version branch from 238775d to bfd2bc3 Compare December 14, 2024 14:34
@shahn
Copy link
Contributor Author

shahn commented Dec 14, 2024

Hope it's OK now :)

tgross35
tgross35 reviewed Dec 14, 2024
View reviewed changes
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\
Copy link
Contributor

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.")

@tgross35
Copy link
Contributor

Hope it's OK now :)

Significantly, thanks :)

Two more nits above then lgtm.

@tgross35
Copy link
Contributor

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
@shahn
Correct spelling of CURRENT_RUSTC_VERSION
7717df2 
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
Copy link
Contributor Author

shahn commented Dec 14, 2024

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!

tgross35
tgross35 approved these changes Dec 14, 2024
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

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
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 14, 2024

📌 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
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 14, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2024
@bors
Auto merge of rust-lang#134318 - matthiaskrgr:rollup-jda0jkx, r=matth…
7caf35b 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132939 (Suggest using deref in patterns)
 - rust-lang#133293 (Updates Solaris target information, adds Solaris maintainer)
 - rust-lang#133392 (Fix ICE when multiple supertrait substitutions need assoc but only one is provided)
 - rust-lang#133986 (Add documentation for anonymous pipe module)
 - rust-lang#134022 (Doc: Extend for tuples to be stabilized in 1.85.0)
 - rust-lang#134259 (Clean up `infer_return_ty_for_fn_sig`)
 - rust-lang#134264 (Arbitrary self types v2: Weak & NonNull diagnostics)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9b99055 into rust-lang:master Dec 15, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2024
@rust-timer
Unrolled build for rust-lang#134022
335dc82 
Rollup merge of rust-lang#134022 - shahn:doc_clarify_extend_for_tuple_version, r=tgross35

Doc: Extend for tuples to be stabilized in 1.85.0

I assumed the RUSTC_CURRENT_VERSION would be replaced automatically, but it doesn't look like it on the nightly docs page. Sorry!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgross35 tgross35 tgross35 approved these changes

Assignees

@tgross35 tgross35

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
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
6 participants
@shahn @rustbot @workingjubilee @tgross35 @bors @joboet