Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 335dc82

Browse files
authoredDec 15, 2024
Unrolled build for rust-lang#134022
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!
2 parents b57d93d + 7717df2 commit 335dc82

File tree

1 file changed

+56
-7
lines changed

1 file changed

+56
-7
lines changed
 

‎library/core/src/iter/traits/collect.rs

+56-7
Original file line numberDiff line numberDiff line change
@@ -493,15 +493,64 @@ impl Extend<()> for () {
493493
}
494494

495495
macro_rules! spec_tuple_impl {
496-
( ($ty_name:ident, $var_name:ident, $extend_ty_name: ident, $trait_name:ident, $default_fn_name:ident, $cnt:tt), ) => {
497-
spec_tuple_impl!($trait_name, $default_fn_name, #[doc(fake_variadic)] #[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 RUSTC_CURRENT_VERSION."] => ($ty_name, $var_name, $extend_ty_name, $cnt),);
496+
(
497+
(
498+
$ty_name:ident, $var_name:ident, $extend_ty_name: ident,
499+
$trait_name:ident, $default_fn_name:ident, $cnt:tt
500+
),
501+
) => {
502+
spec_tuple_impl!(
503+
$trait_name,
504+
$default_fn_name,
505+
#[doc(fake_variadic)]
506+
#[doc = "This trait is implemented for tuples up to twelve items long. The `impl`s for \
507+
1- and 3- through 12-ary tuples were stabilized after 2-tuples, in \
508+
CURRENT_RUSTC_VERSION."]
509+
=> ($ty_name, $var_name, $extend_ty_name, $cnt),
510+
);
498511
};
499-
( ($ty_name:ident, $var_name:ident, $extend_ty_name: ident, $trait_name:ident, $default_fn_name:ident, $cnt:tt), $(($ty_names:ident, $var_names:ident, $extend_ty_names:ident, $trait_names:ident, $default_fn_names:ident, $cnts:tt),)*) => {
500-
501-
spec_tuple_impl!($(($ty_names, $var_names, $extend_ty_names, $trait_names, $default_fn_names, $cnts),)*);
502-
spec_tuple_impl!($trait_name, $default_fn_name, #[doc(hidden)] => ($ty_name, $var_name, $extend_ty_name, $cnt), $(($ty_names, $var_names, $extend_ty_names, $cnts),)*);
512+
(
513+
(
514+
$ty_name:ident, $var_name:ident, $extend_ty_name: ident,
515+
$trait_name:ident, $default_fn_name:ident, $cnt:tt
516+
),
517+
$(
518+
(
519+
$ty_names:ident, $var_names:ident, $extend_ty_names:ident,
520+
$trait_names:ident, $default_fn_names:ident, $cnts:tt
521+
),
522+
)*
523+
) => {
524+
spec_tuple_impl!(
525+
$(
526+
(
527+
$ty_names, $var_names, $extend_ty_names,
528+
$trait_names, $default_fn_names, $cnts
529+
),
530+
)*
531+
);
532+
spec_tuple_impl!(
533+
$trait_name,
534+
$default_fn_name,
535+
#[doc(hidden)]
536+
=> (
537+
$ty_name, $var_name, $extend_ty_name, $cnt
538+
),
539+
$(
540+
(
541+
$ty_names, $var_names, $extend_ty_names, $cnts
542+
),
543+
)*
544+
);
503545
};
504-
($trait_name:ident, $default_fn_name:ident, #[$meta:meta] $(#[$doctext:meta])? => $(($ty_names:ident, $var_names:ident, $extend_ty_names:ident, $cnts:tt),)*) => {
546+
(
547+
$trait_name:ident, $default_fn_name:ident, #[$meta:meta]
548+
$(#[$doctext:meta])? => $(
549+
(
550+
$ty_names:ident, $var_names:ident, $extend_ty_names:ident, $cnts:tt
551+
),
552+
)*
553+
) => {
505554
#[$meta]
506555
$(#[$doctext])?
507556
#[stable(feature = "extend_for_tuple", since = "1.56.0")]

0 commit comments

Comments
 (0)
Failed to load comments.