Skip to content

Commit 45435ed

Browse files
committed
---
yaml --- r: 232203 b: refs/heads/auto c: 22f86d0 h: refs/heads/master i: 232201: 93144d3 232199: 5b07bc4 v: v3
1 parent ab54cfc commit 45435ed

File tree

3 files changed

+122
-2
lines changed

3 files changed

+122
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: c06f464d0197f7f22cfbf750bac683eaf05c2474
11+
refs/heads/auto: 22f86d09e9fe52bacf5931c05b842034da4d8842
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/doc/trpl/error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ let err2: Box<Error> = From::from(parse_err);
12231223

12241224
There is a really important pattern to recognize here. Both `err1` and `err2`
12251225
have the *same type*. This is because they are existentially quantified types,
1226-
or trait objects. In particular, their underlying type is *erased* from the
1226+
or trait objects. In particularly, their underlying type is *erased* from the
12271227
compiler's knowledge, so it truly sees `err1` and `err2` as exactly the same.
12281228
Additionally, we constructed `err1` and `err2` using precisely the same
12291229
function call: `From::from`. This is because `From::from` is overloaded on both
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
12+
struct Array<T> {
13+
f00: [T; 00],
14+
f01: [T; 01],
15+
f02: [T; 02],
16+
f03: [T; 03],
17+
f04: [T; 04],
18+
f05: [T; 05],
19+
f06: [T; 06],
20+
f07: [T; 07],
21+
f08: [T; 08],
22+
f09: [T; 09],
23+
f10: [T; 10],
24+
f11: [T; 11],
25+
f12: [T; 12],
26+
f13: [T; 13],
27+
f14: [T; 14],
28+
f15: [T; 15],
29+
f16: [T; 16],
30+
f17: [T; 17],
31+
f18: [T; 18],
32+
f19: [T; 19],
33+
f20: [T; 20],
34+
f21: [T; 21],
35+
f22: [T; 22],
36+
f23: [T; 23],
37+
f24: [T; 24],
38+
f25: [T; 25],
39+
f26: [T; 26],
40+
f27: [T; 27],
41+
f28: [T; 28],
42+
f29: [T; 29],
43+
f30: [T; 30],
44+
f31: [T; 31],
45+
f32: [T; 32],
46+
}
47+
48+
// FIXME(#7622): merge with `Array` once `[T; N]: Clone` where `T: Clone`
49+
#[derive(Clone, Copy)]
50+
struct CopyArray<T: Copy> {
51+
f00: [T; 00],
52+
f01: [T; 01],
53+
f02: [T; 02],
54+
f03: [T; 03],
55+
f04: [T; 04],
56+
f05: [T; 05],
57+
f06: [T; 06],
58+
f07: [T; 07],
59+
f08: [T; 08],
60+
f09: [T; 09],
61+
f10: [T; 10],
62+
f11: [T; 11],
63+
f12: [T; 12],
64+
f13: [T; 13],
65+
f14: [T; 14],
66+
f15: [T; 15],
67+
f16: [T; 16],
68+
f17: [T; 17],
69+
f18: [T; 18],
70+
f19: [T; 19],
71+
f20: [T; 20],
72+
f21: [T; 21],
73+
f22: [T; 22],
74+
f23: [T; 23],
75+
f24: [T; 24],
76+
f25: [T; 25],
77+
f26: [T; 26],
78+
f27: [T; 27],
79+
f28: [T; 28],
80+
f29: [T; 29],
81+
f30: [T; 30],
82+
f31: [T; 31],
83+
f32: [T; 32],
84+
}
85+
86+
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
87+
struct Fn<A, B, C, D, E, F, G, H, I, J, K, L> {
88+
f00: fn(),
89+
f01: fn(A),
90+
f02: fn(A, B),
91+
f03: fn(A, B, C),
92+
f04: fn(A, B, C, D),
93+
f05: fn(A, B, C, D, E),
94+
f06: fn(A, B, C, D, E, F),
95+
f07: fn(A, B, C, D, E, F, G),
96+
f08: fn(A, B, C, D, E, F, G, H),
97+
f09: fn(A, B, C, D, E, F, G, H, I),
98+
f10: fn(A, B, C, D, E, F, G, H, I, J),
99+
f11: fn(A, B, C, D, E, F, G, H, I, J, K),
100+
f12: fn(A, B, C, D, E, F, G, H, I, J, K, L),
101+
}
102+
103+
#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
104+
struct Tuple<A, B, C, D, E, F, G, H, I, J, K, L> {
105+
f00: (),
106+
f01: (A),
107+
f02: (A, B),
108+
f03: (A, B, C),
109+
f04: (A, B, C, D),
110+
f05: (A, B, C, D, E),
111+
f06: (A, B, C, D, E, F),
112+
f07: (A, B, C, D, E, F, G),
113+
f08: (A, B, C, D, E, F, G, H),
114+
f09: (A, B, C, D, E, F, G, H, I),
115+
f10: (A, B, C, D, E, F, G, H, I, J),
116+
f11: (A, B, C, D, E, F, G, H, I, J, K),
117+
f12: (A, B, C, D, E, F, G, H, I, J, K, L),
118+
}
119+
120+
fn main() {}

0 commit comments

Comments
 (0)