From 7b0eaef58072acc087d23faca5a9f9879f1765d5 Mon Sep 17 00:00:00 2001
From: Marcus Klaas de Vries <mail@marcusklaas.nl>
Date: Mon, 7 Jan 2019 20:11:31 +0100
Subject: Implement type inference for more binary operators

Mostly just for primitive numeric types such as u32 and f64. Not
yet a general solution using trait resolution.
---
 crates/ra_hir/src/ty/tests/data/boolean_op.txt | 31 --------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 crates/ra_hir/src/ty/tests/data/boolean_op.txt

(limited to 'crates/ra_hir/src/ty/tests')

diff --git a/crates/ra_hir/src/ty/tests/data/boolean_op.txt b/crates/ra_hir/src/ty/tests/data/boolean_op.txt
deleted file mode 100644
index cce8d68fb..000000000
--- a/crates/ra_hir/src/ty/tests/data/boolean_op.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-[6; 7) 'x': [unknown]
-[22; 34) '{     0i32 }': i32
-[28; 32) '0i32': i32
-[46; 237) '{     ... < 3 }': bool
-[56; 57) 'x': bool
-[60; 61) 'a': bool
-[60; 66) 'a && b': bool
-[65; 66) 'b': bool
-[76; 77) 'y': bool
-[80; 84) 'true': bool
-[80; 93) 'true || false': bool
-[88; 93) 'false': bool
-[103; 104) 'z': bool
-[107; 108) 'x': bool
-[107; 113) 'x == y': bool
-[112; 113) 'y': bool
-[123; 124) 'h': bool
-[127; 134) 'CONST_1': [unknown]
-[127; 145) 'CONST_...ONST_2': bool
-[138; 145) 'CONST_2': [unknown]
-[155; 156) 'c': [unknown]
-[159; 172) 'f(z || y) + 5': [unknown]
-[182; 183) 'd': [unknown]
-[186; 187) 'b': [unknown]
-[197; 198) 'e': bool
-[201; 205) '3i32': bool
-[201; 222) '3i32 &...world"': bool
-[209; 222) '"hello world"': bool
-[229; 231) '10': [unknown]
-[229; 235) '10 < 3': bool
-[234; 235) '3': [unknown]
-- 
cgit v1.2.3


From 5d15dd70b037b3d1623ebd83d8ef0f66ad6950af Mon Sep 17 00:00:00 2001
From: Marcus Klaas de Vries <mail@marcusklaas.nl>
Date: Mon, 7 Jan 2019 20:39:23 +0100
Subject: Tidy up binary operator type inference; add test file

---
 crates/ra_hir/src/ty/tests/data/binary_op.txt | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 crates/ra_hir/src/ty/tests/data/binary_op.txt

(limited to 'crates/ra_hir/src/ty/tests')

diff --git a/crates/ra_hir/src/ty/tests/data/binary_op.txt b/crates/ra_hir/src/ty/tests/data/binary_op.txt
new file mode 100644
index 000000000..59c07ff43
--- /dev/null
+++ b/crates/ra_hir/src/ty/tests/data/binary_op.txt
@@ -0,0 +1,46 @@
+[6; 7) 'x': [unknown]
+[22; 34) '{     0i32 }': i32
+[28; 32) '0i32': i32
+[46; 342) '{     ... < 3 }': bool
+[56; 57) 'x': bool
+[60; 61) 'a': bool
+[60; 66) 'a && b': bool
+[65; 66) 'b': bool
+[76; 77) 'y': bool
+[80; 84) 'true': bool
+[80; 93) 'true || false': bool
+[88; 93) 'false': bool
+[103; 104) 'z': bool
+[107; 108) 'x': bool
+[107; 113) 'x == y': bool
+[112; 113) 'y': bool
+[123; 134) 'minus_forty': isize
+[144; 152) '-40isize': isize
+[145; 152) '40isize': [unknown]
+[162; 163) 'h': bool
+[166; 177) 'minus_forty': isize
+[166; 188) 'minus_...ONST_2': bool
+[181; 188) 'CONST_2': isize
+[198; 199) 'c': i32
+[202; 203) 'f': fn([unknown],) -> i32
+[202; 211) 'f(z || y)': i32
+[202; 215) 'f(z || y) + 5': i32
+[204; 205) 'z': bool
+[204; 210) 'z || y': bool
+[209; 210) 'y': bool
+[214; 215) '5': i32
+[225; 226) 'd': [unknown]
+[229; 230) 'b': [unknown]
+[240; 241) 'g': ()
+[244; 255) 'minus_forty': isize
+[244; 260) 'minus_...y ^= i': ()
+[259; 260) 'i': isize
+[270; 273) 'ten': usize
+[283; 285) '10': usize
+[295; 308) 'ten_is_eleven': bool
+[311; 314) 'ten': usize
+[311; 326) 'ten == some_num': bool
+[318; 326) 'some_num': usize
+[333; 336) 'ten': usize
+[333; 340) 'ten < 3': bool
+[339; 340) '3': usize
-- 
cgit v1.2.3