Skip to content

Commit 3ec1338

Browse files
committed
---
yaml --- r: 13583 b: refs/heads/master c: a057b13 h: refs/heads/master i: 13581: 7c7e141 13579: 0c89855 13575: 37e1e34 13567: aad563c v: v3
1 parent 803a944 commit 3ec1338

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,5 +1,5 @@
11
---
2-
refs/heads/master: 8aa5762d2eed9e64bfe01f31069a3cbb90b1d5f4
2+
refs/heads/master: a057b132628fd9e5d37332b8719160e57c281414
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2991,8 +2991,8 @@ fn is_binopable(_cx: ctxt, ty: t, op: ast::binop) -> bool {
29912991
ty_bool { tycat_bool }
29922992
ty_int(_) | ty_uint(_) | ty_var_integral(_) { tycat_int }
29932993
ty_float(_) { tycat_float }
2994-
ty_estr(_) | ty_str { tycat_str }
2995-
ty_evec(_, _) | ty_vec(_) { tycat_vec }
2994+
ty_str { tycat_str }
2995+
ty_vec(_) { tycat_vec }
29962996
ty_rec(_) | ty_tup(_) | ty_enum(_, _) { tycat_struct }
29972997
ty_bot { tycat_bot }
29982998
_ { tycat_other }

0 commit comments

Comments
 (0)