From 6249989e6c133792ff457896d4723c0eb0f42137 Mon Sep 17 00:00:00 2001
From: Marcus Klaas de Vries <mail@marcusklaas.nl>
Date: Sun, 27 Jan 2019 17:59:09 +0100
Subject: Process second review

---
 .../ra_hir/src/ty/snapshots/tests__generic_fn.snap | 26 ----------------------
 .../src/ty/snapshots/tests__infer_type_param.snap  | 26 ++++++++++++++++++++++
 crates/ra_hir/src/ty/tests.rs                      |  6 ++---
 3 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 crates/ra_hir/src/ty/snapshots/tests__generic_fn.snap
 create mode 100644 crates/ra_hir/src/ty/snapshots/tests__infer_type_param.snap

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

diff --git a/crates/ra_hir/src/ty/snapshots/tests__generic_fn.snap b/crates/ra_hir/src/ty/snapshots/tests__generic_fn.snap
deleted file mode 100644
index 85aeefa0c..000000000
--- a/crates/ra_hir/src/ty/snapshots/tests__generic_fn.snap
+++ /dev/null
@@ -1,26 +0,0 @@
----
-created: "2019-01-26T18:16:16.568375+00:00"
-creator: insta@0.5.2
-expression: "&result"
-source: crates/ra_hir/src/ty/tests.rs
----
-[10; 11) 'x': [unknown]
-[21; 30) '{     x }': [unknown]
-[27; 28) 'x': [unknown]
-[44; 45) 'x': &[unknown]
-[56; 65) '{     x }': &[unknown]
-[62; 63) 'x': &[unknown]
-[77; 197) '{     ...(1); }': ()
-[87; 88) 'y': u32
-[91; 96) '10u32': u32
-[102; 104) 'id': fn id<u32>(T) -> T
-[102; 107) 'id(y)': u32
-[105; 106) 'y': u32
-[117; 118) 'x': bool
-[127; 132) 'clone': fn clone<bool>(&T) -> T
-[127; 135) 'clone(z)': bool
-[133; 134) 'z': &bool
-[173; 191) 'id::<i...tring>': fn id<i32>(T) -> T
-[173; 194) 'id::<i...ng>(1)': i32
-[192; 193) '1': i32
-
diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_type_param.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_type_param.snap
new file mode 100644
index 000000000..a99323264
--- /dev/null
+++ b/crates/ra_hir/src/ty/snapshots/tests__infer_type_param.snap
@@ -0,0 +1,26 @@
+---
+created: "2019-01-27T16:54:18.368427685+00:00"
+creator: insta@0.5.2
+expression: "&result"
+source: crates/ra_hir/src/ty/tests.rs
+---
+[10; 11) 'x': [unknown]
+[21; 30) '{     x }': [unknown]
+[27; 28) 'x': [unknown]
+[44; 45) 'x': &[unknown]
+[56; 65) '{     x }': &[unknown]
+[62; 63) 'x': &[unknown]
+[77; 157) '{     ...(1); }': ()
+[87; 88) 'y': u32
+[91; 96) '10u32': u32
+[102; 104) 'id': fn id<u32>(T) -> T
+[102; 107) 'id(y)': u32
+[105; 106) 'y': u32
+[117; 118) 'x': bool
+[127; 132) 'clone': fn clone<bool>(&T) -> T
+[127; 135) 'clone(z)': bool
+[133; 134) 'z': &bool
+[141; 151) 'id::<i128>': fn id<i128>(T) -> T
+[141; 154) 'id::<i128>(1)': i128
+[152; 153) '1': i128
+
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index fac566626..ac12d974b 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -597,7 +597,7 @@ fn test() {
 #[test]
 fn infer_type_param() {
     check_inference(
-        "generic_fn",
+        "infer_type_param",
         r#"
 fn id<T>(x: T) -> T {
     x
@@ -611,9 +611,7 @@ fn test() {
     let y = 10u32;
     id(y);
     let x: bool = clone(z);
-
-    // bad turbofish - ignore!
-    id::<i128, String>(1);
+    id::<i128>(1);
 }
 "#,
     );
-- 
cgit v1.2.3