Skip to content

Commit cc78919

Browse files
committed
Auto merge of #23395 - bluss:tuple-macro, r=alexcrichton
Remove the unused parts of the tuple macro in libcore (for `val0` and similar removed methods). Also adjust the module docs accordingly.
2 parents 80a0d82 + 880b8c5 commit cc78919

File tree

1 file changed

+84
-90
lines changed

1 file changed

+84
-90
lines changed

Diff for: src/libcore/tuple.rs

+84-90
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,12 @@
1010

1111
//! Operations on tuples
1212
//!
13-
//! To access a single element of a tuple one can use the following
14-
//! methods:
13+
//! To access a single element of a tuple one can use the `.0`
14+
//! field access syntax.
1515
//!
16-
//! * `valN` - returns a value of _N_-th element
17-
//! * `refN` - returns a reference to _N_-th element
18-
//! * `mutN` - returns a mutable reference to _N_-th element
19-
//!
20-
//! Indexing starts from zero, so `val0` returns first value, `val1`
21-
//! returns second value, and so on. In general, a tuple with _S_
22-
//! elements provides aforementioned methods suffixed with numbers
23-
//! from `0` to `S-1`. Traits which contain these methods are
24-
//! implemented for tuples with up to 12 elements.
16+
//! Indexing starts from zero, so `.0` returns first value, `.1`
17+
//! returns second value, and so on. In general, a tuple with *N*
18+
//! elements has field accessors from 0 to *N* - 1.
2519
//!
2620
//! If every type inside a tuple implements one of the following
2721
//! traits, then a tuple itself also implements it.
@@ -52,7 +46,7 @@ macro_rules! e {
5246
macro_rules! tuple_impls {
5347
($(
5448
$Tuple:ident {
55-
$(($valN:ident, $refN:ident, $mutN:ident, $idx:tt) -> $T:ident)+
49+
$(($idx:tt) -> $T:ident)+
5650
}
5751
)+) => {
5852
$(
@@ -156,105 +150,105 @@ macro_rules! lexical_cmp {
156150

157151
tuple_impls! {
158152
Tuple1 {
159-
(val0, ref0, mut0, 0) -> A
153+
(0) -> A
160154
}
161155
Tuple2 {
162-
(val0, ref0, mut0, 0) -> A
163-
(val1, ref1, mut1, 1) -> B
156+
(0) -> A
157+
(1) -> B
164158
}
165159
Tuple3 {
166-
(val0, ref0, mut0, 0) -> A
167-
(val1, ref1, mut1, 1) -> B
168-
(val2, ref2, mut2, 2) -> C
160+
(0) -> A
161+
(1) -> B
162+
(2) -> C
169163
}
170164
Tuple4 {
171-
(val0, ref0, mut0, 0) -> A
172-
(val1, ref1, mut1, 1) -> B
173-
(val2, ref2, mut2, 2) -> C
174-
(val3, ref3, mut3, 3) -> D
165+
(0) -> A
166+
(1) -> B
167+
(2) -> C
168+
(3) -> D
175169
}
176170
Tuple5 {
177-
(val0, ref0, mut0, 0) -> A
178-
(val1, ref1, mut1, 1) -> B
179-
(val2, ref2, mut2, 2) -> C
180-
(val3, ref3, mut3, 3) -> D
181-
(val4, ref4, mut4, 4) -> E
171+
(0) -> A
172+
(1) -> B
173+
(2) -> C
174+
(3) -> D
175+
(4) -> E
182176
}
183177
Tuple6 {
184-
(val0, ref0, mut0, 0) -> A
185-
(val1, ref1, mut1, 1) -> B
186-
(val2, ref2, mut2, 2) -> C
187-
(val3, ref3, mut3, 3) -> D
188-
(val4, ref4, mut4, 4) -> E
189-
(val5, ref5, mut5, 5) -> F
178+
(0) -> A
179+
(1) -> B
180+
(2) -> C
181+
(3) -> D
182+
(4) -> E
183+
(5) -> F
190184
}
191185
Tuple7 {
192-
(val0, ref0, mut0, 0) -> A
193-
(val1, ref1, mut1, 1) -> B
194-
(val2, ref2, mut2, 2) -> C
195-
(val3, ref3, mut3, 3) -> D
196-
(val4, ref4, mut4, 4) -> E
197-
(val5, ref5, mut5, 5) -> F
198-
(val6, ref6, mut6, 6) -> G
186+
(0) -> A
187+
(1) -> B
188+
(2) -> C
189+
(3) -> D
190+
(4) -> E
191+
(5) -> F
192+
(6) -> G
199193
}
200194
Tuple8 {
201-
(val0, ref0, mut0, 0) -> A
202-
(val1, ref1, mut1, 1) -> B
203-
(val2, ref2, mut2, 2) -> C
204-
(val3, ref3, mut3, 3) -> D
205-
(val4, ref4, mut4, 4) -> E
206-
(val5, ref5, mut5, 5) -> F
207-
(val6, ref6, mut6, 6) -> G
208-
(val7, ref7, mut7, 7) -> H
195+
(0) -> A
196+
(1) -> B
197+
(2) -> C
198+
(3) -> D
199+
(4) -> E
200+
(5) -> F
201+
(6) -> G
202+
(7) -> H
209203
}
210204
Tuple9 {
211-
(val0, ref0, mut0, 0) -> A
212-
(val1, ref1, mut1, 1) -> B
213-
(val2, ref2, mut2, 2) -> C
214-
(val3, ref3, mut3, 3) -> D
215-
(val4, ref4, mut4, 4) -> E
216-
(val5, ref5, mut5, 5) -> F
217-
(val6, ref6, mut6, 6) -> G
218-
(val7, ref7, mut7, 7) -> H
219-
(val8, ref8, mut8, 8) -> I
205+
(0) -> A
206+
(1) -> B
207+
(2) -> C
208+
(3) -> D
209+
(4) -> E
210+
(5) -> F
211+
(6) -> G
212+
(7) -> H
213+
(8) -> I
220214
}
221215
Tuple10 {
222-
(val0, ref0, mut0, 0) -> A
223-
(val1, ref1, mut1, 1) -> B
224-
(val2, ref2, mut2, 2) -> C
225-
(val3, ref3, mut3, 3) -> D
226-
(val4, ref4, mut4, 4) -> E
227-
(val5, ref5, mut5, 5) -> F
228-
(val6, ref6, mut6, 6) -> G
229-
(val7, ref7, mut7, 7) -> H
230-
(val8, ref8, mut8, 8) -> I
231-
(val9, ref9, mut9, 9) -> J
216+
(0) -> A
217+
(1) -> B
218+
(2) -> C
219+
(3) -> D
220+
(4) -> E
221+
(5) -> F
222+
(6) -> G
223+
(7) -> H
224+
(8) -> I
225+
(9) -> J
232226
}
233227
Tuple11 {
234-
(val0, ref0, mut0, 0) -> A
235-
(val1, ref1, mut1, 1) -> B
236-
(val2, ref2, mut2, 2) -> C
237-
(val3, ref3, mut3, 3) -> D
238-
(val4, ref4, mut4, 4) -> E
239-
(val5, ref5, mut5, 5) -> F
240-
(val6, ref6, mut6, 6) -> G
241-
(val7, ref7, mut7, 7) -> H
242-
(val8, ref8, mut8, 8) -> I
243-
(val9, ref9, mut9, 9) -> J
244-
(val10, ref10, mut10, 10) -> K
228+
(0) -> A
229+
(1) -> B
230+
(2) -> C
231+
(3) -> D
232+
(4) -> E
233+
(5) -> F
234+
(6) -> G
235+
(7) -> H
236+
(8) -> I
237+
(9) -> J
238+
(10) -> K
245239
}
246240
Tuple12 {
247-
(val0, ref0, mut0, 0) -> A
248-
(val1, ref1, mut1, 1) -> B
249-
(val2, ref2, mut2, 2) -> C
250-
(val3, ref3, mut3, 3) -> D
251-
(val4, ref4, mut4, 4) -> E
252-
(val5, ref5, mut5, 5) -> F
253-
(val6, ref6, mut6, 6) -> G
254-
(val7, ref7, mut7, 7) -> H
255-
(val8, ref8, mut8, 8) -> I
256-
(val9, ref9, mut9, 9) -> J
257-
(val10, ref10, mut10, 10) -> K
258-
(val11, ref11, mut11, 11) -> L
241+
(0) -> A
242+
(1) -> B
243+
(2) -> C
244+
(3) -> D
245+
(4) -> E
246+
(5) -> F
247+
(6) -> G
248+
(7) -> H
249+
(8) -> I
250+
(9) -> J
251+
(10) -> K
252+
(11) -> L
259253
}
260254
}

0 commit comments

Comments
 (0)