Skip to content

Commit 3904dd5

Browse files
committed
---
yaml --- r: 160111 b: refs/heads/try c: 04f7b69 h: refs/heads/master i: 160109: 308bf9e 160107: 758bc34 160103: 2b92ac2 160095: ddafd2e v: v3
1 parent 4a9bdb2 commit 3904dd5

File tree

122 files changed

+866
-1030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+866
-1030
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: e09d98603e608c9e47d4c89f7b4dca87a4b56da3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9c96a79a74f10bed18b031ce0ac4126c56d6cfb3
5-
refs/heads/try: 803aacd5aef78f90fdd06ae7653fc20eec224992
5+
refs/heads/try: 04f7b690ba6b1b6c6cbcf94fb1a9417e6098a887
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/doc/reference.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Some productions are defined by exclusion of particular Unicode characters:
133133

134134
```{.ebnf .gram}
135135
comment : block_comment | line_comment ;
136-
block_comment : "/*" block_comment_body * "*/" ;
136+
block_comment : "/*" block_comment_body * '*' + '/' ;
137137
block_comment_body : [block_comment | character] * ;
138138
line_comment : "//" non_eol * ;
139139
```
@@ -458,9 +458,10 @@ Examples of floating-point literals of various forms:
458458
12E+99_f64; // type f64
459459
```
460460

461-
##### Boolean literals
461+
##### Unit and boolean literals
462462

463-
The two values of the boolean type are written `true` and `false`.
463+
The _unit value_, the only value of the type that has the same name, is written
464+
as `()`. The two values of the boolean type are written `true` and `false`.
464465

465466
### Symbols
466467

@@ -2716,7 +2717,7 @@ or an item. Path expressions are [lvalues](#lvalues,-rvalues-and-temporaries).
27162717

27172718
### Tuple expressions
27182719

2719-
Tuples are written by enclosing zero or more comma-separated expressions in
2720+
Tuples are written by enclosing one or more comma-separated expressions in
27202721
parentheses. They are used to create [tuple-typed](#tuple-types) values.
27212722

27222723
```{.tuple}
@@ -2725,11 +2726,6 @@ parentheses. They are used to create [tuple-typed](#tuple-types) values.
27252726
("a", 4u, true);
27262727
```
27272728

2728-
### Unit expressions
2729-
2730-
The expression `()` denotes the _unit value_, the only value of the type with
2731-
the same name.
2732-
27332729
### Structure expressions
27342730

27352731
```{.ebnf .gram}

branches/try/src/etc/generate-deriving-span-tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
3838
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
3939
40+
#![feature(struct_variant)]
4041
extern crate rand;
4142
4243
{error_deriving}

0 commit comments

Comments
 (0)