diff options
| author | bors <bors@rust-lang.org> | 2013-09-10 19:41:14 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-10 19:41:14 -0700 |
| commit | 8cf60de758749798a05d7b1f446abfb907c324a7 (patch) | |
| tree | cd66b642f1fdef71fa4e3c9c7c3588e0bdcbdd95 | |
| parent | a9ac27270f9ce20aaf6424f6de5128351c70659e (diff) | |
| parent | 118d37483237f6be7a1af9d62b68b111586e4128 (diff) | |
auto merge of #9111 : thestinger/rust/tycat, r=cmr
The line marked as being for `bot` was actually for `tycat_struct`, and can be replaced with `tycat_other`.
| -rw-r--r-- | src/librustc/middle/ty.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 852f29119d4..a438953be42 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -4266,8 +4266,7 @@ pub fn is_binopable(cx: ctxt, ty: t, op: ast::BinOp) -> bool { static tycat_char: int = 2; static tycat_int: int = 3; static tycat_float: int = 4; - static tycat_struct: int = 5; - static tycat_bot: int = 6; + static tycat_bot: int = 5; static opcat_add: int = 0; static opcat_sub: int = 1; @@ -4310,7 +4309,6 @@ pub fn is_binopable(cx: ctxt, ty: t, op: ast::BinOp) -> bool { ty_bool => tycat_bool, ty_int(_) | ty_uint(_) | ty_infer(IntVar(_)) => tycat_int, ty_float(_) | ty_infer(FloatVar(_)) => tycat_float, - ty_tup(_) | ty_enum(_, _) => tycat_struct, ty_bot => tycat_bot, _ => tycat_other } @@ -4326,8 +4324,7 @@ pub fn is_binopable(cx: ctxt, ty: t, op: ast::BinOp) -> bool { /*char*/ [f, f, f, f, t, t, f, f], /*int*/ [t, t, t, t, t, t, t, f], /*float*/ [t, t, t, f, t, t, f, f], - /*bot*/ [f, f, f, f, f, f, f, f], - /*struct*/ [t, t, t, t, f, f, t, t]]; + /*bot*/ [t, t, t, t, f, f, t, t]]; return tbl[tycat(cx, ty)][opcat(op)]; } |