Skip to content

Commit 6cce6b5

Browse files
ChloeChloe
authored andcommitted
---
yaml --- r: 193563 b: refs/heads/beta c: 9f28f72 h: refs/heads/master i: 193561: 7fb8e42 193559: 04d9084 v: v3
1 parent 9112f1a commit 6cce6b5

36 files changed

+492
-916
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 668c6474081a10768ef143b9984efcab5376bf68
34+
refs/heads/beta: 9f28f7249fb04d824a070df1a6329595de1c2fd7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@ case $CFG_OSTYPE in
430430
CFG_CPUTYPE=x86_64
431431
;;
432432

433+
# Win 8 # uname -s on 64-bit cygwin does not contain WOW64, so simply use uname -m to detect arch (works in my install)
434+
CYGWIN_NT-6.3)
435+
CFG_OSTYPE=pc-windows-gnu
436+
;;
433437
# We do not detect other OS such as XP/2003 using 64 bit using uname.
434438
# If we want to in the future, we will need to use Cygwin - Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative.
435439
*)

branches/beta/src/doc/reference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,10 +2429,6 @@ The currently implemented features of the reference compiler are:
24292429
so that new attributes can be added in a bacwards compatible
24302430
manner (RFC 572).
24312431

2432-
* `custom_derive` - Allows the use of `#[derive(Foo,Bar)]` as sugar for
2433-
`#[derive_Foo] #[derive_Bar]`, which can be user-defined syntax
2434-
extensions.
2435-
24362432
* `intrinsics` - Allows use of the "rust-intrinsics" ABI. Compiler intrinsics
24372433
are inherently unstable and no promise about them is made.
24382434

0 commit comments

Comments
 (0)