Skip to content

Commit 09ef606

Browse files
committed
---
yaml --- r: 234783 b: refs/heads/tmp c: 5b41488 h: refs/heads/master i: 234781: 33b6ec7 234779: 5e0ca78 234775: 0975752 234767: 48ea36d 234751: ab616c5 v: v3
1 parent f12793f commit 09ef606

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
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: 6217b002ba779aae93f340838d9166253c5407bf
28+
refs/heads/tmp: 5b41488f3a0c2e839911ffcce592e0ecfe460a70
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/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/tmp/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/tmp/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)