Skip to content

Commit 803a944

Browse files
committed
---
yaml --- r: 13582 b: refs/heads/master c: 8aa5762 h: refs/heads/master v: v3
1 parent 7c7e141 commit 803a944

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c50eea17d4bbb3aa26ea08ef107a11048c67047d
2+
refs/heads/master: 8aa5762d2eed9e64bfe01f31069a3cbb90b1d5f4
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ty.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,21 +3002,18 @@ fn is_binopable(_cx: ctxt, ty: t, op: ast::binop) -> bool {
30023002
const t: bool = true;
30033003
const f: bool = false;
30043004

3005+
let tbl = [
30053006
/*. add, shift, bit
30063007
. sub, rel, logic
30073008
. mult, eq, */
3008-
/*other*/
3009-
/*bool*/
3010-
/*int*/
3011-
/*float*/
3012-
/*str*/
3013-
/*vec*/
3014-
/*bot*/
3015-
let tbl =
3016-
[[f, f, f, f, t, t, f, f], [f, f, f, f, t, t, t, t],
3017-
[t, t, t, t, t, t, t, f], [t, t, t, f, t, t, f, f],
3018-
[t, f, f, f, t, t, f, f], [t, f, f, f, t, t, f, f],
3019-
[f, f, f, f, t, t, f, f], [t, t, t, t, t, t, t, t]]; /*struct*/
3009+
/*other*/ [f, f, f, f, t, t, f, f],
3010+
/*bool*/ [f, f, f, f, t, t, t, t],
3011+
/*int*/ [t, t, t, t, t, t, t, f],
3012+
/*float*/ [t, t, t, f, t, t, f, f],
3013+
/*str*/ [t, f, f, f, t, t, f, f],
3014+
/*vec*/ [t, f, f, f, t, t, f, f],
3015+
/*bot*/ [f, f, f, f, t, t, f, f],
3016+
/*struct*/ [t, t, t, t, t, t, t, t]];
30203017

30213018
ret tbl[tycat(ty)][opcat(op)];
30223019
}

0 commit comments

Comments
 (0)