Skip to content

Commit 6248639

Browse files
committed
---
yaml --- r: 7737 b: refs/heads/snap-stage3 c: c7d5e79 h: refs/heads/master i: 7735: 612c33b v: v3
1 parent 4e2a4a9 commit 6248639

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ceae107e14249d9c747deeb6caddc6fe6d19626e
4+
refs/heads/snap-stage3: c7d5e79fd88bbf4db9f8b23005d8bb3e00296d41
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/syntax/parse/parser.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
import core::{vec, str, option, either, result};
23
import std::{io, fs};
34
import option::{some, none};
@@ -149,9 +150,7 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
149150
"cont", "ret", "be", "fail", "type", "resource", "check",
150151
"assert", "claim", "native", "fn", "pure",
151152
"unsafe", "import", "export", "let", "const",
152-
"log", "copy", "sendfn", "impl", "iface", "enum",
153-
"m32", "m64", "m128", "f80", "f16", f128",
154-
"class", "trait"] {
153+
"log", "copy", "sendfn", "impl", "iface", "enum"] {
155154
words.insert(word, ());
156155
}
157156
words

branches/snap-stage3/src/snapshots.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
S 2012-01-23 6db688e
2+
winnt-i386 e2e854ea3b53c39c348ecff56c46ec2e742930ef
3+
linux-i386 ec28f47ea12512c79d110209d7278cbdb9db826c
4+
macos-i386 e2fae898344cbbfd52a8cdd21063b8aadc9ca12e
5+
linux-x86_64 b8492ad26d3ad9fbf91e7e1983bec484f76aeb49
6+
macos-x86_64 8a8ecedc8ab6e02881395394a8ca6cb3aca3dece
7+
18
S 2012-01-21 ec82735
29
winnt-i386 b77e911a0651199b2459fc429c3ab05d623cd1e1
310
linux-i386 177e2a4d6996f704af9e5676352278d52cfe0d18

0 commit comments

Comments
 (0)