Skip to content

Commit 93144d3

Browse files
committed
---
yaml --- r: 232201 b: refs/heads/auto c: 5b41488 h: refs/heads/master i: 232199: 5b07bc4 v: v3
1 parent 611e412 commit 93144d3

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
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: 6217b002ba779aae93f340838d9166253c5407bf
11+
refs/heads/auto: 5b41488f3a0c2e839911ffcce592e0ecfe460a70
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/doc/complement-project-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Existing languages at this level of abstraction and efficiency are unsatisfactor
2222

2323
# Is any part of this thing production-ready?
2424

25-
Yes!
25+
No. Feel free to play around, but don't expect completeness or stability yet. Expect incompleteness and breakage.
2626

2727
# Is this a completely Mozilla-planned and orchestrated thing?
2828

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 particularly, their underlying type is *erased* from the
1226+
or trait objects. In particular, 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

branches/auto/src/libcore/ptr.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,6 @@ fnptr_impls_args! { A, B }
385385
fnptr_impls_args! { A, B, C }
386386
fnptr_impls_args! { A, B, C, D }
387387
fnptr_impls_args! { A, B, C, D, E }
388-
fnptr_impls_args! { A, B, C, D, E, F }
389-
fnptr_impls_args! { A, B, C, D, E, F, G }
390-
fnptr_impls_args! { A, B, C, D, E, F, G, H }
391-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I }
392-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I, J }
393-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I, J, K }
394-
fnptr_impls_args! { A, B, C, D, E, F, G, H, I, J, K, L }
395388

396389
// Comparison for pointers
397390
#[stable(feature = "rust1", since = "1.0.0")]

0 commit comments

Comments
 (0)