Skip to content

Commit ac635a0

Browse files
ianbollingermarijnh
authored andcommitted
---
yaml --- r: 8103 b: refs/heads/snap-stage3 c: d1158ca h: refs/heads/master i: 8101: 42761dd 8099: 09e8a7c 8095: b412ffc v: v3
1 parent 21403d3 commit ac635a0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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: 91da710d86a58f4596b6ea22ccf35dd896445ccf
4+
refs/heads/snap-stage3: d1158ca333fe6a982936bf69eeeaabaf21460911
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
151151
"cont", "ret", "be", "fail", "type", "resource", "check",
152152
"assert", "claim", "native", "fn", "pure",
153153
"unsafe", "import", "export", "let", "const",
154-
"log", "copy", "sendfn", "impl", "iface", "enum",
154+
"log", "copy", "impl", "iface", "enum",
155155
"m32", "m64", "m128", "f80", "f16", "f128",
156156
"class", "trait"] {
157157
words.insert(word, ());
@@ -1167,7 +1167,7 @@ fn prec_table() -> @[op_spec] {
11671167
{tok: token::BINOP(token::LSR), op: ast::lsr, prec: 9},
11681168
{tok: token::BINOP(token::ASR), op: ast::asr, prec: 9},
11691169
{tok: token::BINOP(token::AND), op: ast::bitand, prec: 8},
1170-
{tok: token::BINOP(token::CARET), op: ast::bitxor, prec: 6},
1170+
{tok: token::BINOP(token::CARET), op: ast::bitxor, prec: 7},
11711171
{tok: token::BINOP(token::OR), op: ast::bitor, prec: 6},
11721172
// 'as' sits between here with 5
11731173
{tok: token::LT, op: ast::lt, prec: 4},

0 commit comments

Comments
 (0)