diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
index 61c931539573..b608c9fc3431 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -608,7 +608,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
       exists(Param p, int i |
         paramPos(this.getParamList(), p, i) and
         dpos = TPositionalDeclarationPosition(i) and
-        result = inferAnnotatedType(p.getPat(), path)
+        result = p.getTypeRepr().(TypeMention).resolveTypeAt(path)
       )
       or
       exists(SelfParam self |
@@ -1442,9 +1442,9 @@ private module Debug {
     result = inferType(n, path)
   }
 
-  Function debugResolveMethodCallExpr(MethodCallExpr mce) {
-    mce = getRelevantLocatable() and
-    result = resolveMethodCallTarget(mce)
+  Function debugResolveMethod(MethodCall mc) {
+    mc = getRelevantLocatable() and
+    result = resolveMethodCallTarget(mc)
   }
 
   pragma[nomagic]
diff --git a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
index 8219a03269f5..2e16caffa194 100644
--- a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
@@ -6,12 +6,15 @@ models
 | 5 | Summary: lang:core; <crate::option::Option>::zip; Argument[0].Field[core::option::Option::Some(0)]; ReturnValue.Field[core::option::Option::Some(0)].Field[1]; value |
 | 6 | Summary: lang:core; <crate::pin::Pin>::into_inner; Argument[0].Field[core::pin::Pin::__pointer]; ReturnValue; value |
 | 7 | Summary: lang:core; <crate::pin::Pin>::into_inner; Argument[0]; ReturnValue; value |
-| 8 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0]; ReturnValue.Field[core::pin::Pin::__pointer]; value |
-| 9 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0]; ReturnValue; value |
-| 10 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 11 | Summary: lang:core; <i64 as crate::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 12 | Summary: lang:core; crate::ptr::read; Argument[0].Reference; ReturnValue; value |
-| 13 | Summary: lang:core; crate::ptr::write; Argument[1]; Argument[0].Reference; value |
+| 8 | Summary: lang:core; <crate::pin::Pin>::into_inner_unchecked; Argument[0]; ReturnValue; value |
+| 9 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0].Reference; ReturnValue; value |
+| 10 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0]; ReturnValue.Field[core::pin::Pin::__pointer]; value |
+| 11 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0]; ReturnValue; value |
+| 12 | Summary: lang:core; <crate::pin::Pin>::new_unchecked; Argument[0].Reference; ReturnValue; value |
+| 13 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 14 | Summary: lang:core; <i64 as crate::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 15 | Summary: lang:core; crate::ptr::read; Argument[0].Reference; ReturnValue; value |
+| 16 | Summary: lang:core; crate::ptr::write; Argument[1]; Argument[0].Reference; value |
 edges
 | main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:19 | a.unwrap() | provenance | MaD:4 |
 | main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:13 | a [Some] | provenance |  |
@@ -20,18 +23,18 @@ edges
 | main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:19 | b.unwrap() | provenance | MaD:4 |
 | main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone() [Some] | provenance | generated |
 | main.rs:14:13:14:21 | a.clone() [Some] | main.rs:14:9:14:9 | b [Some] | provenance |  |
-| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:10 |
+| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:13 |
 | main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:13 | a [Ok] | provenance |  |
 | main.rs:19:31:19:44 | Ok(...) [Ok] | main.rs:19:9:19:9 | a [Ok] | provenance |  |
 | main.rs:19:34:19:43 | source(...) | main.rs:19:31:19:44 | Ok(...) [Ok] | provenance |  |
-| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:10 |
+| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:13 |
 | main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone() [Ok] | provenance | generated |
 | main.rs:21:13:21:21 | a.clone() [Ok] | main.rs:21:9:21:9 | b [Ok] | provenance |  |
 | main.rs:26:9:26:9 | a | main.rs:27:10:27:10 | a | provenance |  |
 | main.rs:26:9:26:9 | a | main.rs:28:13:28:13 | a | provenance |  |
 | main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | a | provenance |  |
 | main.rs:28:9:28:9 | b | main.rs:29:10:29:10 | b | provenance |  |
-| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | MaD:11 |
+| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | MaD:14 |
 | main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | generated |
 | main.rs:28:13:28:21 | a.clone() | main.rs:28:9:28:9 | b | provenance |  |
 | main.rs:43:18:43:22 | SelfParam [Wrapper] | main.rs:44:26:44:29 | self [Wrapper] | provenance |  |
@@ -64,8 +67,8 @@ edges
 | main.rs:69:18:69:23 | TuplePat [tuple.1] | main.rs:69:22:69:22 | m | provenance |  |
 | main.rs:69:22:69:22 | m | main.rs:71:22:71:22 | m | provenance |  |
 | main.rs:92:29:92:29 | [post] y [&ref] | main.rs:93:33:93:33 | y [&ref] | provenance |  |
-| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:13 |
-| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:12 |
+| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:16 |
+| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:15 |
 | main.rs:108:13:108:17 | mut i | main.rs:109:34:109:34 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:110:33:110:33 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:111:47:111:47 | i | provenance |  |
@@ -76,8 +79,8 @@ edges
 | main.rs:109:13:109:20 | mut pin1 [Pin, &ref] | main.rs:115:31:115:34 | pin1 [Pin, &ref] | provenance |  |
 | main.rs:109:24:109:35 | ...::new(...) [&ref] | main.rs:109:13:109:20 | mut pin1 [&ref] | provenance |  |
 | main.rs:109:24:109:35 | ...::new(...) [Pin, &ref] | main.rs:109:13:109:20 | mut pin1 [Pin, &ref] | provenance |  |
-| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [&ref] | provenance | MaD:9 |
-| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [Pin, &ref] | provenance | MaD:8 |
+| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [&ref] | provenance | MaD:11 |
+| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [Pin, &ref] | provenance | MaD:10 |
 | main.rs:109:34:109:34 | i | main.rs:109:33:109:34 | &i [&ref] | provenance |  |
 | main.rs:110:13:110:20 | mut pin2 [&ref] | main.rs:116:15:116:18 | pin2 [&ref] | provenance |  |
 | main.rs:110:24:110:34 | ...::pin(...) [&ref] | main.rs:110:13:110:20 | mut pin2 [&ref] | provenance |  |
@@ -92,10 +95,26 @@ edges
 | main.rs:115:31:115:34 | pin1 [Pin, &ref] | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | provenance | MaD:6 |
 | main.rs:116:15:116:18 | pin2 [&ref] | main.rs:116:14:116:18 | * ... | provenance |  |
 | main.rs:117:15:117:18 | pin3 [&ref] | main.rs:117:14:117:18 | * ... | provenance |  |
+| main.rs:122:13:122:18 | mut ms [MyStruct] | main.rs:123:34:123:35 | ms [MyStruct] | provenance |  |
 | main.rs:122:13:122:18 | mut ms [MyStruct] | main.rs:127:14:127:15 | ms [MyStruct] | provenance |  |
 | main.rs:122:22:122:49 | MyStruct {...} [MyStruct] | main.rs:122:13:122:18 | mut ms [MyStruct] | provenance |  |
 | main.rs:122:38:122:47 | source(...) | main.rs:122:22:122:49 | MyStruct {...} [MyStruct] | provenance |  |
+| main.rs:123:13:123:20 | mut pin1 [MyStruct] | main.rs:129:30:129:33 | pin1 [MyStruct] | provenance |  |
+| main.rs:123:24:123:36 | ...::new(...) [MyStruct] | main.rs:123:13:123:20 | mut pin1 [MyStruct] | provenance |  |
+| main.rs:123:33:123:35 | &ms [&ref, MyStruct] | main.rs:123:24:123:36 | ...::new(...) [MyStruct] | provenance | MaD:9 |
+| main.rs:123:34:123:35 | ms [MyStruct] | main.rs:123:33:123:35 | &ms [&ref, MyStruct] | provenance |  |
 | main.rs:127:14:127:15 | ms [MyStruct] | main.rs:127:14:127:19 | ms.val | provenance |  |
+| main.rs:129:14:129:34 | ...::into_inner(...) [MyStruct] | main.rs:129:14:129:38 | ... .val | provenance |  |
+| main.rs:129:30:129:33 | pin1 [MyStruct] | main.rs:129:14:129:34 | ...::into_inner(...) [MyStruct] | provenance | MaD:7 |
+| main.rs:136:13:136:18 | mut ms [MyStruct] | main.rs:137:44:137:45 | ms [MyStruct] | provenance |  |
+| main.rs:136:22:136:49 | MyStruct {...} [MyStruct] | main.rs:136:13:136:18 | mut ms [MyStruct] | provenance |  |
+| main.rs:136:38:136:47 | source(...) | main.rs:136:22:136:49 | MyStruct {...} [MyStruct] | provenance |  |
+| main.rs:137:13:137:20 | mut pin5 [MyStruct] | main.rs:139:40:139:43 | pin5 [MyStruct] | provenance |  |
+| main.rs:137:24:137:46 | ...::new_unchecked(...) [MyStruct] | main.rs:137:13:137:20 | mut pin5 [MyStruct] | provenance |  |
+| main.rs:137:43:137:45 | &ms [&ref, MyStruct] | main.rs:137:24:137:46 | ...::new_unchecked(...) [MyStruct] | provenance | MaD:12 |
+| main.rs:137:44:137:45 | ms [MyStruct] | main.rs:137:43:137:45 | &ms [&ref, MyStruct] | provenance |  |
+| main.rs:139:14:139:44 | ...::into_inner_unchecked(...) [MyStruct] | main.rs:139:14:139:48 | ... .val | provenance |  |
+| main.rs:139:40:139:43 | pin5 [MyStruct] | main.rs:139:14:139:44 | ...::into_inner_unchecked(...) [MyStruct] | provenance | MaD:8 |
 nodes
 | main.rs:12:9:12:9 | a [Some] | semmle.label | a [Some] |
 | main.rs:12:13:12:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
@@ -183,8 +202,25 @@ nodes
 | main.rs:122:13:122:18 | mut ms [MyStruct] | semmle.label | mut ms [MyStruct] |
 | main.rs:122:22:122:49 | MyStruct {...} [MyStruct] | semmle.label | MyStruct {...} [MyStruct] |
 | main.rs:122:38:122:47 | source(...) | semmle.label | source(...) |
+| main.rs:123:13:123:20 | mut pin1 [MyStruct] | semmle.label | mut pin1 [MyStruct] |
+| main.rs:123:24:123:36 | ...::new(...) [MyStruct] | semmle.label | ...::new(...) [MyStruct] |
+| main.rs:123:33:123:35 | &ms [&ref, MyStruct] | semmle.label | &ms [&ref, MyStruct] |
+| main.rs:123:34:123:35 | ms [MyStruct] | semmle.label | ms [MyStruct] |
 | main.rs:127:14:127:15 | ms [MyStruct] | semmle.label | ms [MyStruct] |
 | main.rs:127:14:127:19 | ms.val | semmle.label | ms.val |
+| main.rs:129:14:129:34 | ...::into_inner(...) [MyStruct] | semmle.label | ...::into_inner(...) [MyStruct] |
+| main.rs:129:14:129:38 | ... .val | semmle.label | ... .val |
+| main.rs:129:30:129:33 | pin1 [MyStruct] | semmle.label | pin1 [MyStruct] |
+| main.rs:136:13:136:18 | mut ms [MyStruct] | semmle.label | mut ms [MyStruct] |
+| main.rs:136:22:136:49 | MyStruct {...} [MyStruct] | semmle.label | MyStruct {...} [MyStruct] |
+| main.rs:136:38:136:47 | source(...) | semmle.label | source(...) |
+| main.rs:137:13:137:20 | mut pin5 [MyStruct] | semmle.label | mut pin5 [MyStruct] |
+| main.rs:137:24:137:46 | ...::new_unchecked(...) [MyStruct] | semmle.label | ...::new_unchecked(...) [MyStruct] |
+| main.rs:137:43:137:45 | &ms [&ref, MyStruct] | semmle.label | &ms [&ref, MyStruct] |
+| main.rs:137:44:137:45 | ms [MyStruct] | semmle.label | ms [MyStruct] |
+| main.rs:139:14:139:44 | ...::into_inner_unchecked(...) [MyStruct] | semmle.label | ...::into_inner_unchecked(...) [MyStruct] |
+| main.rs:139:14:139:48 | ... .val | semmle.label | ... .val |
+| main.rs:139:40:139:43 | pin5 [MyStruct] | semmle.label | pin5 [MyStruct] |
 subpaths
 | main.rs:50:15:50:15 | w [Wrapper] | main.rs:43:18:43:22 | SelfParam [Wrapper] | main.rs:43:33:45:9 | { ... } [Wrapper] | main.rs:53:17:53:25 | w.clone() [Wrapper] |
 testFailures
@@ -205,3 +241,5 @@ testFailures
 | main.rs:116:14:116:18 | * ... | main.rs:108:21:108:30 | source(...) | main.rs:116:14:116:18 | * ... | $@ | main.rs:108:21:108:30 | source(...) | source(...) |
 | main.rs:117:14:117:18 | * ... | main.rs:108:21:108:30 | source(...) | main.rs:117:14:117:18 | * ... | $@ | main.rs:108:21:108:30 | source(...) | source(...) |
 | main.rs:127:14:127:19 | ms.val | main.rs:122:38:122:47 | source(...) | main.rs:127:14:127:19 | ms.val | $@ | main.rs:122:38:122:47 | source(...) | source(...) |
+| main.rs:129:14:129:38 | ... .val | main.rs:122:38:122:47 | source(...) | main.rs:129:14:129:38 | ... .val | $@ | main.rs:122:38:122:47 | source(...) | source(...) |
+| main.rs:139:14:139:48 | ... .val | main.rs:136:38:136:47 | source(...) | main.rs:139:14:139:48 | ... .val | $@ | main.rs:136:38:136:47 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/modeled/main.rs b/rust/ql/test/library-tests/dataflow/modeled/main.rs
index c660a33116dd..292dd2599af2 100644
--- a/rust/ql/test/library-tests/dataflow/modeled/main.rs
+++ b/rust/ql/test/library-tests/dataflow/modeled/main.rs
@@ -95,8 +95,8 @@ mod ptr {
     }
 }
 
-use std::pin::Pin;
 use std::pin::pin;
+use std::pin::Pin;
 
 #[derive(Clone)]
 struct MyStruct {
@@ -126,7 +126,7 @@ fn test_pin() {
         let mut pin4 = pin!(&ms);
         sink(ms.val); // $ hasValueFlow=41
         sink(pin1.val); // $ MISSING: hasValueFlow=41
-        sink(Pin::into_inner(pin1).val); // $ MISSING: hasValueFlow=41
+        sink(Pin::into_inner(pin1).val); // $ hasValueFlow=41
         sink(pin2.val); // $ MISSING: hasValueFlow=41
         sink(pin3.val); // $ MISSING: hasValueFlow=41
         sink(pin4.val); // $ MISSING: hasValueFlow=41
@@ -136,7 +136,7 @@ fn test_pin() {
         let mut ms = MyStruct { val: source(42) };
         let mut pin5 = Pin::new_unchecked(&ms);
         sink(pin5.val); // $ MISSING: hasValueFlow=42
-        sink(Pin::into_inner_unchecked(pin5).val); // $ MISSING: hasValueFlow=42
+        sink(Pin::into_inner_unchecked(pin5).val); // $ hasValueFlow=42
     }
 
     {
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index bb45bea016af..3bb28962bac5 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -6,6 +6,7 @@ inferType
 | main.rs:26:17:26:32 | MyThing {...} |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:26:30:26:30 | S |  | main.rs:2:5:3:13 | S |
 | main.rs:27:18:27:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:27:18:27:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:27:26:27:26 | x |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:27:26:27:28 | x.a |  | main.rs:2:5:3:13 | S |
 | main.rs:32:13:32:13 | x |  | main.rs:16:5:19:5 | GenericThing |
@@ -14,6 +15,7 @@ inferType
 | main.rs:32:17:32:42 | GenericThing::<...> {...} | A | main.rs:2:5:3:13 | S |
 | main.rs:32:40:32:40 | S |  | main.rs:2:5:3:13 | S |
 | main.rs:33:18:33:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:33:18:33:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:33:26:33:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:33:26:33:26 | x | A | main.rs:2:5:3:13 | S |
 | main.rs:33:26:33:28 | x.a |  | main.rs:2:5:3:13 | S |
@@ -23,6 +25,7 @@ inferType
 | main.rs:36:17:36:37 | GenericThing {...} | A | main.rs:2:5:3:13 | S |
 | main.rs:36:35:36:35 | S |  | main.rs:2:5:3:13 | S |
 | main.rs:37:18:37:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:37:18:37:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:37:26:37:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:37:26:37:26 | x | A | main.rs:2:5:3:13 | S |
 | main.rs:37:26:37:28 | x.a |  | main.rs:2:5:3:13 | S |
@@ -31,6 +34,7 @@ inferType
 | main.rs:42:16:42:33 | ...::MyNone(...) |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:42:16:42:33 | ...::MyNone(...) | T | main.rs:2:5:3:13 | S |
 | main.rs:44:18:44:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:44:18:44:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:44:26:44:26 | x |  | main.rs:21:5:23:5 | OptionS |
 | main.rs:44:26:44:28 | x.a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:44:26:44:28 | x.a | T | main.rs:2:5:3:13 | S |
@@ -43,6 +47,7 @@ inferType
 | main.rs:48:16:48:33 | ...::MyNone(...) |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:48:16:48:33 | ...::MyNone(...) | T | main.rs:2:5:3:13 | S |
 | main.rs:50:18:50:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:50:18:50:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:50:26:50:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:50:26:50:26 | x | A | main.rs:10:5:14:5 | MyOption |
 | main.rs:50:26:50:26 | x | A.T | main.rs:2:5:3:13 | S |
@@ -64,6 +69,7 @@ inferType
 | main.rs:56:30:56:32 | x.a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:56:30:56:32 | x.a | T | main.rs:2:5:3:13 | S |
 | main.rs:57:18:57:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:57:18:57:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:57:26:57:26 | a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:57:26:57:26 | a | T | main.rs:2:5:3:13 | S |
 | main.rs:70:19:70:22 | SelfParam |  | main.rs:67:5:67:21 | Foo |
@@ -74,6 +80,7 @@ inferType
 | main.rs:75:13:75:16 | self |  | main.rs:67:5:67:21 | Foo |
 | main.rs:79:23:84:5 | { ... } |  | main.rs:67:5:67:21 | Foo |
 | main.rs:80:18:80:33 | "main.rs::m1::f\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:80:18:80:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:81:13:81:13 | x |  | main.rs:67:5:67:21 | Foo |
 | main.rs:81:17:81:22 | Foo {...} |  | main.rs:67:5:67:21 | Foo |
 | main.rs:82:13:82:13 | y |  | main.rs:67:5:67:21 | Foo |
@@ -83,6 +90,7 @@ inferType
 | main.rs:86:22:86:22 | y |  | main.rs:67:5:67:21 | Foo |
 | main.rs:86:37:90:5 | { ... } |  | main.rs:67:5:67:21 | Foo |
 | main.rs:87:18:87:33 | "main.rs::m1::g\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:87:18:87:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:88:9:88:9 | x |  | main.rs:67:5:67:21 | Foo |
 | main.rs:88:9:88:14 | x.m1() |  | main.rs:67:5:67:21 | Foo |
 | main.rs:89:9:89:9 | y |  | main.rs:67:5:67:21 | Foo |
@@ -136,18 +144,22 @@ inferType
 | main.rs:152:17:152:33 | MyThing {...} | A | main.rs:127:5:128:14 | S2 |
 | main.rs:152:30:152:31 | S2 |  | main.rs:127:5:128:14 | S2 |
 | main.rs:155:18:155:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:155:18:155:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:155:26:155:26 | x |  | main.rs:120:5:123:5 | MyThing |
 | main.rs:155:26:155:26 | x | A | main.rs:125:5:126:14 | S1 |
 | main.rs:155:26:155:28 | x.a |  | main.rs:125:5:126:14 | S1 |
 | main.rs:156:18:156:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:156:18:156:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:156:26:156:26 | y |  | main.rs:120:5:123:5 | MyThing |
 | main.rs:156:26:156:26 | y | A | main.rs:127:5:128:14 | S2 |
 | main.rs:156:26:156:28 | y.a |  | main.rs:127:5:128:14 | S2 |
 | main.rs:158:18:158:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:158:18:158:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:158:26:158:26 | x |  | main.rs:120:5:123:5 | MyThing |
 | main.rs:158:26:158:26 | x | A | main.rs:125:5:126:14 | S1 |
 | main.rs:158:26:158:31 | x.m1() |  | main.rs:125:5:126:14 | S1 |
 | main.rs:159:18:159:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:159:18:159:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:159:26:159:26 | y |  | main.rs:120:5:123:5 | MyThing |
 | main.rs:159:26:159:26 | y | A | main.rs:127:5:128:14 | S2 |
 | main.rs:159:26:159:31 | y.m1() |  | main.rs:120:5:123:5 | MyThing |
@@ -164,10 +176,12 @@ inferType
 | main.rs:162:17:162:33 | MyThing {...} | A | main.rs:127:5:128:14 | S2 |
 | main.rs:162:30:162:31 | S2 |  | main.rs:127:5:128:14 | S2 |
 | main.rs:164:18:164:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:164:18:164:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:164:26:164:26 | x |  | main.rs:120:5:123:5 | MyThing |
 | main.rs:164:26:164:26 | x | A | main.rs:125:5:126:14 | S1 |
 | main.rs:164:26:164:31 | x.m2() |  | main.rs:125:5:126:14 | S1 |
 | main.rs:165:18:165:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:165:18:165:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:165:26:165:26 | y |  | main.rs:120:5:123:5 | MyThing |
 | main.rs:165:26:165:26 | y | A | main.rs:127:5:128:14 | S2 |
 | main.rs:165:26:165:31 | y.m2() |  | main.rs:127:5:128:14 | S2 |
@@ -307,10 +321,12 @@ inferType
 | main.rs:320:24:320:40 | MyThing {...} | A | main.rs:185:5:186:14 | S3 |
 | main.rs:320:37:320:38 | S3 |  | main.rs:185:5:186:14 | S3 |
 | main.rs:324:18:324:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:324:18:324:38 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:324:26:324:33 | thing_s1 |  | main.rs:170:5:173:5 | MyThing |
 | main.rs:324:26:324:33 | thing_s1 | A | main.rs:181:5:182:14 | S1 |
 | main.rs:324:26:324:38 | thing_s1.m1() |  | main.rs:181:5:182:14 | S1 |
 | main.rs:325:18:325:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:325:18:325:40 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:325:26:325:33 | thing_s2 |  | main.rs:170:5:173:5 | MyThing |
 | main.rs:325:26:325:33 | thing_s2 | A | main.rs:183:5:184:14 | S2 |
 | main.rs:325:26:325:38 | thing_s2.m1() |  | main.rs:170:5:173:5 | MyThing |
@@ -321,6 +337,7 @@ inferType
 | main.rs:326:22:326:29 | thing_s3 | A | main.rs:185:5:186:14 | S3 |
 | main.rs:326:22:326:34 | thing_s3.m1() |  | main.rs:185:5:186:14 | S3 |
 | main.rs:327:18:327:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:327:18:327:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:327:26:327:27 | s3 |  | main.rs:185:5:186:14 | S3 |
 | main.rs:329:13:329:14 | p1 |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:329:13:329:14 | p1 | P1 | main.rs:181:5:182:14 | S1 |
@@ -331,6 +348,7 @@ inferType
 | main.rs:329:31:329:32 | S1 |  | main.rs:181:5:182:14 | S1 |
 | main.rs:329:39:329:40 | S1 |  | main.rs:181:5:182:14 | S1 |
 | main.rs:330:18:330:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:330:18:330:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:330:26:330:27 | p1 |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:330:26:330:27 | p1 | P1 | main.rs:181:5:182:14 | S1 |
 | main.rs:330:26:330:27 | p1 | P2 | main.rs:181:5:182:14 | S1 |
@@ -344,6 +362,7 @@ inferType
 | main.rs:332:31:332:32 | S1 |  | main.rs:181:5:182:14 | S1 |
 | main.rs:332:39:332:40 | S2 |  | main.rs:183:5:184:14 | S2 |
 | main.rs:333:18:333:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:333:18:333:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:333:26:333:27 | p2 |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:333:26:333:27 | p2 | P1 | main.rs:181:5:182:14 | S1 |
 | main.rs:333:26:333:27 | p2 | P2 | main.rs:183:5:184:14 | S2 |
@@ -361,6 +380,7 @@ inferType
 | main.rs:336:30:336:31 | S1 |  | main.rs:181:5:182:14 | S1 |
 | main.rs:337:17:337:18 | S3 |  | main.rs:185:5:186:14 | S3 |
 | main.rs:339:18:339:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:339:18:339:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:339:26:339:27 | p3 |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:339:26:339:27 | p3 | P1 | main.rs:170:5:173:5 | MyThing |
 | main.rs:339:26:339:27 | p3 | P1.A | main.rs:181:5:182:14 | S1 |
@@ -380,6 +400,7 @@ inferType
 | main.rs:343:17:343:17 | a | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:343:17:343:23 | a.fst() |  | main.rs:181:5:182:14 | S1 |
 | main.rs:344:18:344:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:344:18:344:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:344:26:344:26 | x |  | main.rs:181:5:182:14 | S1 |
 | main.rs:345:13:345:13 | y |  | main.rs:181:5:182:14 | S1 |
 | main.rs:345:17:345:17 | a |  | main.rs:175:5:179:5 | MyPair |
@@ -387,6 +408,7 @@ inferType
 | main.rs:345:17:345:17 | a | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:345:17:345:23 | a.snd() |  | main.rs:181:5:182:14 | S1 |
 | main.rs:346:18:346:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:346:18:346:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:346:26:346:26 | y |  | main.rs:181:5:182:14 | S1 |
 | main.rs:352:13:352:13 | b |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:352:13:352:13 | b | P1 | main.rs:183:5:184:14 | S2 |
@@ -402,6 +424,7 @@ inferType
 | main.rs:353:17:353:17 | b | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:353:17:353:23 | b.fst() |  | main.rs:181:5:182:14 | S1 |
 | main.rs:354:18:354:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:354:18:354:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:354:26:354:26 | x |  | main.rs:181:5:182:14 | S1 |
 | main.rs:355:13:355:13 | y |  | main.rs:183:5:184:14 | S2 |
 | main.rs:355:17:355:17 | b |  | main.rs:175:5:179:5 | MyPair |
@@ -409,12 +432,14 @@ inferType
 | main.rs:355:17:355:17 | b | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:355:17:355:23 | b.snd() |  | main.rs:183:5:184:14 | S2 |
 | main.rs:356:18:356:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:356:18:356:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:356:26:356:26 | y |  | main.rs:183:5:184:14 | S2 |
 | main.rs:360:13:360:13 | x |  | main.rs:181:5:182:14 | S1 |
 | main.rs:360:17:360:39 | call_trait_m1(...) |  | main.rs:181:5:182:14 | S1 |
 | main.rs:360:31:360:38 | thing_s1 |  | main.rs:170:5:173:5 | MyThing |
 | main.rs:360:31:360:38 | thing_s1 | A | main.rs:181:5:182:14 | S1 |
 | main.rs:361:18:361:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:361:18:361:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:361:26:361:26 | x |  | main.rs:181:5:182:14 | S1 |
 | main.rs:362:13:362:13 | y |  | main.rs:170:5:173:5 | MyThing |
 | main.rs:362:13:362:13 | y | A | main.rs:183:5:184:14 | S2 |
@@ -423,6 +448,7 @@ inferType
 | main.rs:362:31:362:38 | thing_s2 |  | main.rs:170:5:173:5 | MyThing |
 | main.rs:362:31:362:38 | thing_s2 | A | main.rs:183:5:184:14 | S2 |
 | main.rs:363:18:363:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:363:18:363:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:363:26:363:26 | y |  | main.rs:170:5:173:5 | MyThing |
 | main.rs:363:26:363:26 | y | A | main.rs:183:5:184:14 | S2 |
 | main.rs:363:26:363:28 | y.a |  | main.rs:183:5:184:14 | S2 |
@@ -440,6 +466,7 @@ inferType
 | main.rs:367:25:367:25 | a | P1 | main.rs:181:5:182:14 | S1 |
 | main.rs:367:25:367:25 | a | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:368:18:368:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:368:18:368:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:368:26:368:26 | x |  | main.rs:181:5:182:14 | S1 |
 | main.rs:369:13:369:13 | y |  | main.rs:181:5:182:14 | S1 |
 | main.rs:369:17:369:26 | get_snd(...) |  | main.rs:181:5:182:14 | S1 |
@@ -447,6 +474,7 @@ inferType
 | main.rs:369:25:369:25 | a | P1 | main.rs:181:5:182:14 | S1 |
 | main.rs:369:25:369:25 | a | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:370:18:370:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:370:18:370:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:370:26:370:26 | y |  | main.rs:181:5:182:14 | S1 |
 | main.rs:373:13:373:13 | b |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:373:13:373:13 | b | P1 | main.rs:183:5:184:14 | S2 |
@@ -462,6 +490,7 @@ inferType
 | main.rs:374:25:374:25 | b | P1 | main.rs:183:5:184:14 | S2 |
 | main.rs:374:25:374:25 | b | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:375:18:375:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:375:18:375:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:375:26:375:26 | x |  | main.rs:181:5:182:14 | S1 |
 | main.rs:376:13:376:13 | y |  | main.rs:183:5:184:14 | S2 |
 | main.rs:376:17:376:26 | get_snd(...) |  | main.rs:183:5:184:14 | S2 |
@@ -469,6 +498,7 @@ inferType
 | main.rs:376:25:376:25 | b | P1 | main.rs:183:5:184:14 | S2 |
 | main.rs:376:25:376:25 | b | P2 | main.rs:181:5:182:14 | S1 |
 | main.rs:377:18:377:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:377:18:377:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:377:26:377:26 | y |  | main.rs:183:5:184:14 | S2 |
 | main.rs:379:13:379:13 | c |  | main.rs:175:5:179:5 | MyPair |
 | main.rs:379:13:379:13 | c | P1 | main.rs:185:5:186:14 | S3 |
@@ -510,10 +540,12 @@ inferType
 | main.rs:403:26:403:29 | SelfParam |  | main.rs:392:5:393:14 | S1 |
 | main.rs:403:38:405:9 | { ... } |  | main.rs:392:5:393:14 | S1 |
 | main.rs:404:20:404:31 | "not called" |  | {EXTERNAL LOCATION} | str |
+| main.rs:404:20:404:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:408:28:408:31 | SelfParam |  | main.rs:392:5:393:14 | S1 |
 | main.rs:408:34:408:35 | s1 |  | main.rs:392:5:393:14 | S1 |
 | main.rs:408:48:410:9 | { ... } |  | main.rs:392:5:393:14 | S1 |
 | main.rs:409:20:409:31 | "not called" |  | {EXTERNAL LOCATION} | str |
+| main.rs:409:20:409:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:415:26:415:29 | SelfParam |  | main.rs:392:5:393:14 | S1 |
 | main.rs:415:38:417:9 | { ... } |  | main.rs:392:5:393:14 | S1 |
 | main.rs:416:13:416:16 | self |  | main.rs:392:5:393:14 | S1 |
@@ -523,9 +555,11 @@ inferType
 | main.rs:426:13:426:13 | x |  | main.rs:392:5:393:14 | S1 |
 | main.rs:426:17:426:18 | S1 |  | main.rs:392:5:393:14 | S1 |
 | main.rs:427:18:427:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:427:18:427:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:427:26:427:26 | x |  | main.rs:392:5:393:14 | S1 |
 | main.rs:427:26:427:42 | x.common_method() |  | main.rs:392:5:393:14 | S1 |
 | main.rs:428:18:428:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:428:18:428:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:428:26:428:26 | x |  | main.rs:392:5:393:14 | S1 |
 | main.rs:428:26:428:44 | x.common_method_2() |  | main.rs:392:5:393:14 | S1 |
 | main.rs:445:19:445:22 | SelfParam |  | main.rs:443:5:446:5 | Self [trait FirstTrait] |
@@ -535,24 +569,28 @@ inferType
 | main.rs:455:18:455:18 | x |  | main.rs:453:45:453:61 | T |
 | main.rs:455:18:455:27 | x.method() |  | main.rs:453:35:453:42 | I |
 | main.rs:456:18:456:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:456:18:456:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:456:26:456:27 | s1 |  | main.rs:453:35:453:42 | I |
 | main.rs:459:65:459:65 | x |  | main.rs:459:46:459:62 | T |
 | main.rs:461:13:461:14 | s2 |  | main.rs:459:36:459:43 | I |
 | main.rs:461:18:461:18 | x |  | main.rs:459:46:459:62 | T |
 | main.rs:461:18:461:27 | x.method() |  | main.rs:459:36:459:43 | I |
 | main.rs:462:18:462:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:462:18:462:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:462:26:462:27 | s2 |  | main.rs:459:36:459:43 | I |
 | main.rs:465:49:465:49 | x |  | main.rs:465:30:465:46 | T |
 | main.rs:466:13:466:13 | s |  | main.rs:435:5:436:14 | S1 |
 | main.rs:466:17:466:17 | x |  | main.rs:465:30:465:46 | T |
 | main.rs:466:17:466:26 | x.method() |  | main.rs:435:5:436:14 | S1 |
 | main.rs:467:18:467:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:467:18:467:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:467:26:467:26 | s |  | main.rs:435:5:436:14 | S1 |
 | main.rs:470:53:470:53 | x |  | main.rs:470:34:470:50 | T |
 | main.rs:471:13:471:13 | s |  | main.rs:435:5:436:14 | S1 |
 | main.rs:471:17:471:17 | x |  | main.rs:470:34:470:50 | T |
 | main.rs:471:17:471:26 | x.method() |  | main.rs:435:5:436:14 | S1 |
 | main.rs:472:18:472:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:472:18:472:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:472:26:472:26 | s |  | main.rs:435:5:436:14 | S1 |
 | main.rs:476:16:476:19 | SelfParam |  | main.rs:475:5:479:5 | Self [trait Pair] |
 | main.rs:478:16:478:19 | SelfParam |  | main.rs:475:5:479:5 | Self [trait Pair] |
@@ -565,6 +603,7 @@ inferType
 | main.rs:484:18:484:18 | y |  | main.rs:481:41:481:55 | T |
 | main.rs:484:18:484:24 | y.snd() |  | main.rs:438:5:439:14 | S2 |
 | main.rs:485:18:485:29 | "{:?}, {:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:485:18:485:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:485:32:485:33 | s1 |  | main.rs:435:5:436:14 | S1 |
 | main.rs:485:36:485:37 | s2 |  | main.rs:438:5:439:14 | S2 |
 | main.rs:488:69:488:69 | x |  | main.rs:488:52:488:66 | T |
@@ -576,6 +615,7 @@ inferType
 | main.rs:491:18:491:18 | y |  | main.rs:488:52:488:66 | T |
 | main.rs:491:18:491:24 | y.snd() |  | main.rs:488:41:488:49 | T2 |
 | main.rs:492:18:492:29 | "{:?}, {:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:492:18:492:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:492:32:492:33 | s1 |  | main.rs:435:5:436:14 | S1 |
 | main.rs:492:36:492:37 | s2 |  | main.rs:488:41:488:49 | T2 |
 | main.rs:508:15:508:18 | SelfParam |  | main.rs:507:5:516:5 | Self [trait MyTrait] |
@@ -611,10 +651,12 @@ inferType
 | main.rs:536:17:536:33 | MyThing {...} | T | main.rs:504:5:505:14 | S2 |
 | main.rs:536:30:536:31 | S2 |  | main.rs:504:5:505:14 | S2 |
 | main.rs:538:18:538:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:538:18:538:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:538:26:538:26 | x |  | main.rs:497:5:500:5 | MyThing |
 | main.rs:538:26:538:26 | x | T | main.rs:502:5:503:14 | S1 |
 | main.rs:538:26:538:31 | x.m1() |  | main.rs:502:5:503:14 | S1 |
 | main.rs:539:18:539:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:539:18:539:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:539:26:539:26 | y |  | main.rs:497:5:500:5 | MyThing |
 | main.rs:539:26:539:26 | y | T | main.rs:504:5:505:14 | S2 |
 | main.rs:539:26:539:31 | y.m1() |  | main.rs:504:5:505:14 | S2 |
@@ -629,10 +671,12 @@ inferType
 | main.rs:542:17:542:33 | MyThing {...} | T | main.rs:504:5:505:14 | S2 |
 | main.rs:542:30:542:31 | S2 |  | main.rs:504:5:505:14 | S2 |
 | main.rs:544:18:544:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:544:18:544:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:544:26:544:26 | x |  | main.rs:497:5:500:5 | MyThing |
 | main.rs:544:26:544:26 | x | T | main.rs:502:5:503:14 | S1 |
 | main.rs:544:26:544:31 | x.m2() |  | main.rs:502:5:503:14 | S1 |
 | main.rs:545:18:545:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:545:18:545:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:545:26:545:26 | y |  | main.rs:497:5:500:5 | MyThing |
 | main.rs:545:26:545:26 | y | T | main.rs:504:5:505:14 | S2 |
 | main.rs:545:26:545:31 | y.m2() |  | main.rs:504:5:505:14 | S2 |
@@ -647,10 +691,12 @@ inferType
 | main.rs:548:18:548:34 | MyThing {...} | T | main.rs:504:5:505:14 | S2 |
 | main.rs:548:31:548:32 | S2 |  | main.rs:504:5:505:14 | S2 |
 | main.rs:550:18:550:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:550:18:550:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:550:26:550:42 | call_trait_m1(...) |  | main.rs:502:5:503:14 | S1 |
 | main.rs:550:40:550:41 | x2 |  | main.rs:497:5:500:5 | MyThing |
 | main.rs:550:40:550:41 | x2 | T | main.rs:502:5:503:14 | S1 |
 | main.rs:551:18:551:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:551:18:551:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:551:26:551:42 | call_trait_m1(...) |  | main.rs:504:5:505:14 | S2 |
 | main.rs:551:40:551:41 | y2 |  | main.rs:497:5:500:5 | MyThing |
 | main.rs:551:40:551:41 | y2 | T | main.rs:504:5:505:14 | S2 |
@@ -678,6 +724,7 @@ inferType
 | main.rs:560:37:560:38 | x3 | T | main.rs:497:5:500:5 | MyThing |
 | main.rs:560:37:560:38 | x3 | T.T | main.rs:502:5:503:14 | S1 |
 | main.rs:561:18:561:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:561:18:561:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:561:26:561:26 | a |  | main.rs:502:5:503:14 | S1 |
 | main.rs:562:13:562:13 | b |  | main.rs:504:5:505:14 | S2 |
 | main.rs:562:17:562:39 | call_trait_thing_m1(...) |  | main.rs:504:5:505:14 | S2 |
@@ -685,6 +732,7 @@ inferType
 | main.rs:562:37:562:38 | y3 | T | main.rs:497:5:500:5 | MyThing |
 | main.rs:562:37:562:38 | y3 | T.T | main.rs:504:5:505:14 | S2 |
 | main.rs:563:18:563:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:563:18:563:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:563:26:563:26 | b |  | main.rs:504:5:505:14 | S2 |
 | main.rs:574:19:574:22 | SelfParam |  | main.rs:568:5:571:5 | Wrapper |
 | main.rs:574:19:574:22 | SelfParam | A | main.rs:573:10:573:10 | A |
@@ -759,6 +807,7 @@ inferType
 | main.rs:686:13:686:14 | x1 |  | main.rs:619:5:620:13 | S |
 | main.rs:686:18:686:18 | S |  | main.rs:619:5:620:13 | S |
 | main.rs:688:18:688:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:688:18:688:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:688:26:688:27 | x1 |  | main.rs:619:5:620:13 | S |
 | main.rs:688:26:688:32 | x1.m1() |  | main.rs:625:5:626:14 | AT |
 | main.rs:690:13:690:14 | x2 |  | main.rs:619:5:620:13 | S |
@@ -767,16 +816,19 @@ inferType
 | main.rs:692:17:692:18 | x2 |  | main.rs:619:5:620:13 | S |
 | main.rs:692:17:692:23 | x2.m2() |  | main.rs:625:5:626:14 | AT |
 | main.rs:693:18:693:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:693:18:693:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:693:26:693:26 | y |  | main.rs:625:5:626:14 | AT |
 | main.rs:695:13:695:14 | x3 |  | main.rs:619:5:620:13 | S |
 | main.rs:695:18:695:18 | S |  | main.rs:619:5:620:13 | S |
 | main.rs:697:18:697:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:697:18:697:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:697:26:697:27 | x3 |  | main.rs:619:5:620:13 | S |
 | main.rs:697:26:697:34 | x3.put(...) |  | main.rs:568:5:571:5 | Wrapper |
 | main.rs:697:26:697:34 | x3.put(...) | A | {EXTERNAL LOCATION} | i32 |
 | main.rs:697:26:697:43 | ... .unwrap() |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:697:33:697:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:700:18:700:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:700:18:700:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:700:26:700:27 | x3 |  | main.rs:619:5:620:13 | S |
 | main.rs:700:26:700:40 | x3.putTwo(...) |  | main.rs:568:5:571:5 | Wrapper |
 | main.rs:700:26:700:40 | x3.putTwo(...) | A | main.rs:639:36:639:50 | AssociatedParam |
@@ -785,15 +837,18 @@ inferType
 | main.rs:700:39:700:39 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:702:20:702:20 | S |  | main.rs:619:5:620:13 | S |
 | main.rs:703:18:703:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:703:18:703:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:705:13:705:14 | x5 |  | main.rs:622:5:623:14 | S2 |
 | main.rs:705:18:705:19 | S2 |  | main.rs:622:5:623:14 | S2 |
 | main.rs:706:18:706:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:706:18:706:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:706:26:706:27 | x5 |  | main.rs:622:5:623:14 | S2 |
 | main.rs:706:26:706:32 | x5.m1() |  | main.rs:568:5:571:5 | Wrapper |
 | main.rs:706:26:706:32 | x5.m1() | A | main.rs:622:5:623:14 | S2 |
 | main.rs:707:13:707:14 | x6 |  | main.rs:622:5:623:14 | S2 |
 | main.rs:707:18:707:19 | S2 |  | main.rs:622:5:623:14 | S2 |
 | main.rs:708:18:708:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:708:18:708:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:708:26:708:27 | x6 |  | main.rs:622:5:623:14 | S2 |
 | main.rs:708:26:708:32 | x6.m2() |  | main.rs:568:5:571:5 | Wrapper |
 | main.rs:708:26:708:32 | x6.m2() | A | main.rs:622:5:623:14 | S2 |
@@ -827,10 +882,12 @@ inferType
 | main.rs:739:17:739:36 | ...::C2 {...} | A | main.rs:725:5:726:14 | S2 |
 | main.rs:739:33:739:34 | S2 |  | main.rs:725:5:726:14 | S2 |
 | main.rs:741:18:741:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:741:18:741:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:741:26:741:26 | x |  | main.rs:717:5:721:5 | MyEnum |
 | main.rs:741:26:741:26 | x | A | main.rs:723:5:724:14 | S1 |
 | main.rs:741:26:741:31 | x.m1() |  | main.rs:723:5:724:14 | S1 |
 | main.rs:742:18:742:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:742:18:742:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:742:26:742:26 | y |  | main.rs:717:5:721:5 | MyEnum |
 | main.rs:742:26:742:26 | y | A | main.rs:725:5:726:14 | S2 |
 | main.rs:742:26:742:31 | y.m1() |  | main.rs:725:5:726:14 | S2 |
@@ -841,6 +898,8 @@ inferType
 | main.rs:773:16:773:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:773:16:773:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:773:20:773:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:773:20:773:20 | 2 |  | file://:0:0:0:0 | & |
+| main.rs:773:20:773:20 | 2 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:773:22:775:13 | { ... } |  | main.rs:767:20:767:22 | Tr2 |
 | main.rs:774:17:774:20 | self |  | main.rs:767:5:779:5 | Self [trait MyTrait2] |
 | main.rs:774:17:774:25 | self.m1() |  | main.rs:767:20:767:22 | Tr2 |
@@ -853,6 +912,8 @@ inferType
 | main.rs:787:16:787:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:787:16:787:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:787:20:787:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:787:20:787:20 | 2 |  | file://:0:0:0:0 | & |
+| main.rs:787:20:787:20 | 2 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:787:22:789:13 | { ... } |  | main.rs:781:20:781:22 | Tr3 |
 | main.rs:788:17:788:20 | self |  | main.rs:781:5:793:5 | Self [trait MyTrait3] |
 | main.rs:788:17:788:25 | self.m2() |  | main.rs:747:5:750:5 | MyThing |
@@ -889,6 +950,7 @@ inferType
 | main.rs:821:17:821:22 | x.m1() |  | main.rs:747:5:750:5 | MyThing |
 | main.rs:821:17:821:22 | x.m1() | A | main.rs:757:5:758:14 | S1 |
 | main.rs:822:18:822:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:822:18:822:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:822:26:822:26 | a |  | main.rs:747:5:750:5 | MyThing |
 | main.rs:822:26:822:26 | a | A | main.rs:757:5:758:14 | S1 |
 | main.rs:826:13:826:13 | x |  | main.rs:747:5:750:5 | MyThing |
@@ -902,10 +964,12 @@ inferType
 | main.rs:827:17:827:33 | MyThing {...} | A | main.rs:759:5:760:14 | S2 |
 | main.rs:827:30:827:31 | S2 |  | main.rs:759:5:760:14 | S2 |
 | main.rs:829:18:829:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:829:18:829:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:829:26:829:26 | x |  | main.rs:747:5:750:5 | MyThing |
 | main.rs:829:26:829:26 | x | A | main.rs:757:5:758:14 | S1 |
 | main.rs:829:26:829:31 | x.m1() |  | main.rs:757:5:758:14 | S1 |
 | main.rs:830:18:830:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:830:18:830:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:830:26:830:26 | y |  | main.rs:747:5:750:5 | MyThing |
 | main.rs:830:26:830:26 | y | A | main.rs:759:5:760:14 | S2 |
 | main.rs:830:26:830:31 | y.m1() |  | main.rs:759:5:760:14 | S2 |
@@ -920,10 +984,12 @@ inferType
 | main.rs:833:17:833:33 | MyThing {...} | A | main.rs:759:5:760:14 | S2 |
 | main.rs:833:30:833:31 | S2 |  | main.rs:759:5:760:14 | S2 |
 | main.rs:835:18:835:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:835:18:835:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:835:26:835:26 | x |  | main.rs:747:5:750:5 | MyThing |
 | main.rs:835:26:835:26 | x | A | main.rs:757:5:758:14 | S1 |
 | main.rs:835:26:835:31 | x.m2() |  | main.rs:757:5:758:14 | S1 |
 | main.rs:836:18:836:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:836:18:836:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:836:26:836:26 | y |  | main.rs:747:5:750:5 | MyThing |
 | main.rs:836:26:836:26 | y | A | main.rs:759:5:760:14 | S2 |
 | main.rs:836:26:836:31 | y.m2() |  | main.rs:759:5:760:14 | S2 |
@@ -938,10 +1004,12 @@ inferType
 | main.rs:839:17:839:34 | MyThing2 {...} | A | main.rs:759:5:760:14 | S2 |
 | main.rs:839:31:839:32 | S2 |  | main.rs:759:5:760:14 | S2 |
 | main.rs:841:18:841:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:841:18:841:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:841:26:841:26 | x |  | main.rs:752:5:755:5 | MyThing2 |
 | main.rs:841:26:841:26 | x | A | main.rs:757:5:758:14 | S1 |
 | main.rs:841:26:841:31 | x.m3() |  | main.rs:757:5:758:14 | S1 |
 | main.rs:842:18:842:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:842:18:842:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:842:26:842:26 | y |  | main.rs:752:5:755:5 | MyThing2 |
 | main.rs:842:26:842:26 | y | A | main.rs:759:5:760:14 | S2 |
 | main.rs:842:26:842:31 | y.m3() |  | main.rs:759:5:760:14 | S2 |
@@ -981,6 +1049,7 @@ inferType
 | main.rs:884:13:884:13 | x |  | main.rs:856:5:857:14 | S1 |
 | main.rs:884:17:884:18 | S1 |  | main.rs:856:5:857:14 | S1 |
 | main.rs:885:18:885:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:885:18:885:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:885:26:885:31 | id(...) |  | file://:0:0:0:0 | & |
 | main.rs:885:26:885:31 | id(...) | &T | main.rs:856:5:857:14 | S1 |
 | main.rs:885:29:885:30 | &x |  | file://:0:0:0:0 | & |
@@ -989,6 +1058,7 @@ inferType
 | main.rs:887:13:887:13 | x |  | main.rs:856:5:857:14 | S1 |
 | main.rs:887:17:887:18 | S1 |  | main.rs:856:5:857:14 | S1 |
 | main.rs:888:18:888:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:888:18:888:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:888:26:888:37 | id::<...>(...) |  | file://:0:0:0:0 | & |
 | main.rs:888:26:888:37 | id::<...>(...) | &T | main.rs:856:5:857:14 | S1 |
 | main.rs:888:35:888:36 | &x |  | file://:0:0:0:0 | & |
@@ -997,6 +1067,7 @@ inferType
 | main.rs:890:13:890:13 | x |  | main.rs:856:5:857:14 | S1 |
 | main.rs:890:17:890:18 | S1 |  | main.rs:856:5:857:14 | S1 |
 | main.rs:891:18:891:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:891:18:891:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:891:26:891:44 | id::<...>(...) |  | file://:0:0:0:0 | & |
 | main.rs:891:26:891:44 | id::<...>(...) | &T | main.rs:856:5:857:14 | S1 |
 | main.rs:891:42:891:43 | &x |  | file://:0:0:0:0 | & |
@@ -1021,8 +1092,10 @@ inferType
 | main.rs:912:19:912:22 | self | Snd | main.rs:910:15:910:17 | Snd |
 | main.rs:913:43:913:82 | MacroExpr |  | main.rs:910:15:910:17 | Snd |
 | main.rs:913:50:913:81 | "PairNone has no second elemen... |  | {EXTERNAL LOCATION} | str |
+| main.rs:913:50:913:81 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:914:43:914:81 | MacroExpr |  | main.rs:910:15:910:17 | Snd |
 | main.rs:914:50:914:80 | "PairFst has no second element... |  | {EXTERNAL LOCATION} | str |
+| main.rs:914:50:914:80 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:915:37:915:39 | snd |  | main.rs:910:15:910:17 | Snd |
 | main.rs:915:45:915:47 | snd |  | main.rs:910:15:910:17 | Snd |
 | main.rs:916:41:916:43 | snd |  | main.rs:910:15:910:17 | Snd |
@@ -1043,6 +1116,7 @@ inferType
 | main.rs:943:17:943:29 | t.unwrapSnd() | Snd | main.rs:927:5:928:14 | S3 |
 | main.rs:943:17:943:41 | ... .unwrapSnd() |  | main.rs:927:5:928:14 | S3 |
 | main.rs:944:18:944:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:944:18:944:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:944:26:944:26 | x |  | main.rs:927:5:928:14 | S3 |
 | main.rs:949:13:949:14 | p1 |  | main.rs:902:5:908:5 | PairOption |
 | main.rs:949:13:949:14 | p1 | Fst | main.rs:921:5:922:14 | S1 |
@@ -1053,6 +1127,7 @@ inferType
 | main.rs:949:47:949:48 | S1 |  | main.rs:921:5:922:14 | S1 |
 | main.rs:949:51:949:52 | S2 |  | main.rs:924:5:925:14 | S2 |
 | main.rs:950:18:950:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:950:18:950:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:950:26:950:27 | p1 |  | main.rs:902:5:908:5 | PairOption |
 | main.rs:950:26:950:27 | p1 | Fst | main.rs:921:5:922:14 | S1 |
 | main.rs:950:26:950:27 | p1 | Snd | main.rs:924:5:925:14 | S2 |
@@ -1063,6 +1138,7 @@ inferType
 | main.rs:953:26:953:47 | ...::PairNone(...) | Fst | main.rs:921:5:922:14 | S1 |
 | main.rs:953:26:953:47 | ...::PairNone(...) | Snd | main.rs:924:5:925:14 | S2 |
 | main.rs:954:18:954:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:954:18:954:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:954:26:954:27 | p2 |  | main.rs:902:5:908:5 | PairOption |
 | main.rs:954:26:954:27 | p2 | Fst | main.rs:921:5:922:14 | S1 |
 | main.rs:954:26:954:27 | p2 | Snd | main.rs:924:5:925:14 | S2 |
@@ -1074,6 +1150,7 @@ inferType
 | main.rs:957:34:957:56 | ...::PairSnd(...) | Snd | main.rs:927:5:928:14 | S3 |
 | main.rs:957:54:957:55 | S3 |  | main.rs:927:5:928:14 | S3 |
 | main.rs:958:18:958:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:958:18:958:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:958:26:958:27 | p3 |  | main.rs:902:5:908:5 | PairOption |
 | main.rs:958:26:958:27 | p3 | Fst | main.rs:924:5:925:14 | S2 |
 | main.rs:958:26:958:27 | p3 | Snd | main.rs:927:5:928:14 | S3 |
@@ -1084,6 +1161,7 @@ inferType
 | main.rs:961:35:961:56 | ...::PairNone(...) | Fst | main.rs:924:5:925:14 | S2 |
 | main.rs:961:35:961:56 | ...::PairNone(...) | Snd | main.rs:927:5:928:14 | S3 |
 | main.rs:962:18:962:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:962:18:962:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:962:26:962:27 | p3 |  | main.rs:902:5:908:5 | PairOption |
 | main.rs:962:26:962:27 | p3 | Fst | main.rs:924:5:925:14 | S2 |
 | main.rs:962:26:962:27 | p3 | Snd | main.rs:927:5:928:14 | S3 |
@@ -1132,6 +1210,7 @@ inferType
 | main.rs:1008:13:1008:14 | x1 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1008:18:1008:37 | ...::new(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1009:18:1009:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1009:18:1009:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1009:26:1009:27 | x1 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1011:13:1011:18 | mut x2 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1011:13:1011:18 | mut x2 | T | main.rs:1004:5:1005:13 | S |
@@ -1141,6 +1220,7 @@ inferType
 | main.rs:1012:9:1012:10 | x2 | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1012:16:1012:16 | S |  | main.rs:1004:5:1005:13 | S |
 | main.rs:1013:18:1013:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1013:18:1013:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1013:26:1013:27 | x2 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1013:26:1013:27 | x2 | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1015:13:1015:18 | mut x3 |  | main.rs:969:5:973:5 | MyOption |
@@ -1148,6 +1228,7 @@ inferType
 | main.rs:1016:9:1016:10 | x3 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1016:21:1016:21 | S |  | main.rs:1004:5:1005:13 | S |
 | main.rs:1017:18:1017:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1017:18:1017:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1017:26:1017:27 | x3 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1019:13:1019:18 | mut x4 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1019:13:1019:18 | mut x4 | T | main.rs:1004:5:1005:13 | S |
@@ -1160,6 +1241,7 @@ inferType
 | main.rs:1020:28:1020:29 | x4 | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1020:32:1020:32 | S |  | main.rs:1004:5:1005:13 | S |
 | main.rs:1021:18:1021:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1021:18:1021:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1021:26:1021:27 | x4 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1021:26:1021:27 | x4 | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1023:13:1023:14 | x5 |  | main.rs:969:5:973:5 | MyOption |
@@ -1171,6 +1253,7 @@ inferType
 | main.rs:1023:35:1023:57 | ...::MyNone(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1023:35:1023:57 | ...::MyNone(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1024:18:1024:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1024:18:1024:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1024:26:1024:27 | x5 |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1024:26:1024:27 | x5 | T | main.rs:969:5:973:5 | MyOption |
 | main.rs:1024:26:1024:27 | x5 | T.T | main.rs:1004:5:1005:13 | S |
@@ -1185,6 +1268,7 @@ inferType
 | main.rs:1026:35:1026:57 | ...::MyNone(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1026:35:1026:57 | ...::MyNone(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1027:18:1027:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1027:18:1027:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1027:26:1027:61 | ...::flatten(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1027:26:1027:61 | ...::flatten(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1027:59:1027:60 | x6 |  | main.rs:969:5:973:5 | MyOption |
@@ -1197,6 +1281,8 @@ inferType
 | main.rs:1030:26:1030:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1030:26:1030:30 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1030:30:1030:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1030:30:1030:30 | 2 |  | file://:0:0:0:0 | & |
+| main.rs:1030:30:1030:30 | 2 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1030:32:1032:9 | { ... } |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1030:32:1032:9 | { ... } | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1031:13:1031:30 | ...::MyNone(...) |  | main.rs:969:5:973:5 | MyOption |
@@ -1207,6 +1293,7 @@ inferType
 | main.rs:1033:13:1033:31 | ...::MySome(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1033:30:1033:30 | S |  | main.rs:1004:5:1005:13 | S |
 | main.rs:1035:18:1035:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1035:18:1035:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1035:26:1035:32 | from_if |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1035:26:1035:32 | from_if | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1038:13:1038:22 | from_match |  | main.rs:969:5:973:5 | MyOption |
@@ -1216,6 +1303,8 @@ inferType
 | main.rs:1038:32:1038:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1038:32:1038:36 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1038:36:1038:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1038:36:1038:36 | 2 |  | file://:0:0:0:0 | & |
+| main.rs:1038:36:1038:36 | 2 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1039:13:1039:16 | true |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1039:21:1039:38 | ...::MyNone(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1039:21:1039:38 | ...::MyNone(...) | T | main.rs:1004:5:1005:13 | S |
@@ -1224,6 +1313,7 @@ inferType
 | main.rs:1040:22:1040:40 | ...::MySome(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1040:39:1040:39 | S |  | main.rs:1004:5:1005:13 | S |
 | main.rs:1042:18:1042:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1042:18:1042:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1042:26:1042:35 | from_match |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1042:26:1042:35 | from_match | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1045:13:1045:21 | from_loop |  | main.rs:969:5:973:5 | MyOption |
@@ -1233,12 +1323,15 @@ inferType
 | main.rs:1046:16:1046:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1046:16:1046:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1046:20:1046:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1046:20:1046:20 | 2 |  | file://:0:0:0:0 | & |
+| main.rs:1046:20:1046:20 | 2 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1047:23:1047:40 | ...::MyNone(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1047:23:1047:40 | ...::MyNone(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1049:19:1049:37 | ...::MySome(...) |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1049:19:1049:37 | ...::MySome(...) | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1049:36:1049:36 | S |  | main.rs:1004:5:1005:13 | S |
 | main.rs:1051:18:1051:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1051:18:1051:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1051:26:1051:34 | from_loop |  | main.rs:969:5:973:5 | MyOption |
 | main.rs:1051:26:1051:34 | from_loop | T | main.rs:1004:5:1005:13 | S |
 | main.rs:1064:15:1064:18 | SelfParam |  | main.rs:1057:5:1058:19 | S |
@@ -1275,6 +1368,7 @@ inferType
 | main.rs:1078:18:1078:22 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1078:20:1078:21 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1079:18:1079:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1079:18:1079:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1079:26:1079:27 | x1 |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1079:26:1079:27 | x1 | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1079:26:1079:32 | x1.m1() |  | main.rs:1060:5:1061:14 | S2 |
@@ -1284,11 +1378,13 @@ inferType
 | main.rs:1081:18:1081:22 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1081:20:1081:21 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1083:18:1083:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1083:18:1083:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1083:26:1083:27 | x2 |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1083:26:1083:27 | x2 | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1083:26:1083:32 | x2.m2() |  | file://:0:0:0:0 | & |
 | main.rs:1083:26:1083:32 | x2.m2() | &T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1084:18:1084:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1084:18:1084:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1084:26:1084:27 | x2 |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1084:26:1084:27 | x2 | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1084:26:1084:32 | x2.m3() |  | file://:0:0:0:0 | & |
@@ -1299,6 +1395,7 @@ inferType
 | main.rs:1086:18:1086:22 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1086:20:1086:21 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1088:18:1088:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1088:18:1088:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1088:26:1088:41 | ...::m2(...) |  | file://:0:0:0:0 | & |
 | main.rs:1088:26:1088:41 | ...::m2(...) | &T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1088:38:1088:40 | &x3 |  | file://:0:0:0:0 | & |
@@ -1307,6 +1404,7 @@ inferType
 | main.rs:1088:39:1088:40 | x3 |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1088:39:1088:40 | x3 | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1089:18:1089:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1089:18:1089:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1089:26:1089:41 | ...::m3(...) |  | file://:0:0:0:0 | & |
 | main.rs:1089:26:1089:41 | ...::m3(...) | &T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1089:38:1089:40 | &x3 |  | file://:0:0:0:0 | & |
@@ -1324,12 +1422,14 @@ inferType
 | main.rs:1091:19:1091:23 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1091:21:1091:22 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1093:18:1093:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1093:18:1093:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1093:26:1093:27 | x4 |  | file://:0:0:0:0 | & |
 | main.rs:1093:26:1093:27 | x4 | &T | main.rs:1057:5:1058:19 | S |
 | main.rs:1093:26:1093:27 | x4 | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1093:26:1093:32 | x4.m2() |  | file://:0:0:0:0 | & |
 | main.rs:1093:26:1093:32 | x4.m2() | &T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1094:18:1094:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1094:18:1094:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1094:26:1094:27 | x4 |  | file://:0:0:0:0 | & |
 | main.rs:1094:26:1094:27 | x4 | &T | main.rs:1057:5:1058:19 | S |
 | main.rs:1094:26:1094:27 | x4 | &T.T | main.rs:1060:5:1061:14 | S2 |
@@ -1345,11 +1445,13 @@ inferType
 | main.rs:1096:19:1096:23 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1096:21:1096:22 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1098:18:1098:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1098:18:1098:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1098:26:1098:27 | x5 |  | file://:0:0:0:0 | & |
 | main.rs:1098:26:1098:27 | x5 | &T | main.rs:1057:5:1058:19 | S |
 | main.rs:1098:26:1098:27 | x5 | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1098:26:1098:32 | x5.m1() |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1099:18:1099:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1099:18:1099:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1099:26:1099:27 | x5 |  | file://:0:0:0:0 | & |
 | main.rs:1099:26:1099:27 | x5 | &T | main.rs:1057:5:1058:19 | S |
 | main.rs:1099:26:1099:27 | x5 | &T.T | main.rs:1060:5:1061:14 | S2 |
@@ -1373,6 +1475,7 @@ inferType
 | main.rs:1101:19:1101:23 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:21:1101:22 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:18:1103:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1103:18:1103:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1103:26:1103:30 | (...) |  | file://:0:0:0:0 | & |
 | main.rs:1103:26:1103:30 | (...) |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1103:26:1103:30 | (...) | &T | main.rs:1057:5:1058:19 | S |
@@ -1407,6 +1510,7 @@ inferType
 | main.rs:1108:17:1108:23 | x7.m1() |  | file://:0:0:0:0 | & |
 | main.rs:1108:17:1108:23 | x7.m1() | &T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1109:18:1109:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1109:18:1109:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1109:26:1109:27 | x7 |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1109:26:1109:27 | x7 | T | file://:0:0:0:0 | & |
 | main.rs:1109:26:1109:27 | x7 | T.&T | main.rs:1060:5:1061:14 | S2 |
@@ -1573,6 +1677,7 @@ inferType
 | main.rs:1199:22:1199:30 | &mut flag | &T | main.rs:1157:5:1160:5 | MyFlag |
 | main.rs:1199:27:1199:30 | flag |  | main.rs:1157:5:1160:5 | MyFlag |
 | main.rs:1200:18:1200:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1200:18:1200:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1200:26:1200:29 | flag |  | main.rs:1157:5:1160:5 | MyFlag |
 | main.rs:1214:43:1217:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1214:43:1217:5 | { ... } | E | main.rs:1207:5:1208:14 | S1 |
@@ -1642,6 +1747,7 @@ inferType
 | main.rs:1237:53:1240:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1237:53:1240:9 | { ... } | E | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1238:22:1238:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1238:22:1238:30 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1239:13:1239:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1239:13:1239:34 | ...::Ok::<...>(...) | E | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1241:9:1241:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
@@ -1652,14 +1758,17 @@ inferType
 | main.rs:1245:37:1245:52 | try_same_error(...) | E | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1245:37:1245:52 | try_same_error(...) | T | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1246:22:1246:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1246:22:1246:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1249:37:1249:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1249:37:1249:55 | try_convert_error(...) | E | main.rs:1210:5:1211:14 | S2 |
 | main.rs:1249:37:1249:55 | try_convert_error(...) | T | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1250:22:1250:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1250:22:1250:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1253:37:1253:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1253:37:1253:49 | try_chained(...) | E | main.rs:1210:5:1211:14 | S2 |
 | main.rs:1253:37:1253:49 | try_chained(...) | T | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1254:22:1254:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1254:22:1254:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1257:37:1257:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1257:37:1257:63 | try_complex(...) | E | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1257:37:1257:63 | try_complex(...) | T | main.rs:1207:5:1208:14 | S1 |
@@ -1668,14 +1777,21 @@ inferType
 | main.rs:1257:49:1257:62 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1257:60:1257:61 | S1 |  | main.rs:1207:5:1208:14 | S1 |
 | main.rs:1258:22:1258:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1258:22:1258:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1265:13:1265:13 | x |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1265:22:1265:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1266:13:1266:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1266:13:1266:13 | y |  | file://:0:0:0:0 | & |
+| main.rs:1266:13:1266:13 | y | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1266:17:1266:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1266:17:1266:17 | 2 |  | file://:0:0:0:0 | & |
+| main.rs:1266:17:1266:17 | 2 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1267:13:1267:13 | z |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1267:17:1267:17 | x |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1267:17:1267:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1267:21:1267:21 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1267:21:1267:21 | y |  | file://:0:0:0:0 | & |
+| main.rs:1267:21:1267:21 | y | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1268:13:1268:13 | z |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1268:17:1268:17 | x |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1268:17:1268:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
@@ -1702,6 +1818,8 @@ inferType
 | main.rs:1284:20:1284:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1284:20:1284:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1284:26:1284:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1284:26:1284:27 | 33 |  | file://:0:0:0:0 | & |
+| main.rs:1284:26:1284:27 | 33 | &T | {EXTERNAL LOCATION} | i32 |
 | main.rs:1285:12:1285:15 | cond |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1286:17:1286:17 | z |  | file://:0:0:0:0 | () |
 | main.rs:1286:21:1286:27 | (...) |  | file://:0:0:0:0 | () |
@@ -1721,11 +1839,15 @@ inferType
 | main.rs:1309:20:1309:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1309:29:1309:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1309:29:1309:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1309:29:1309:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1309:29:1309:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1310:20:1310:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1310:20:1310:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1310:20:1310:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1310:29:1310:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1310:29:1310:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1310:29:1310:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1310:29:1310:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1317:23:1317:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1317:23:1317:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1317:34:1317:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1735,12 +1857,16 @@ inferType
 | main.rs:1318:13:1318:27 | ... += ... |  | file://:0:0:0:0 | () |
 | main.rs:1318:23:1318:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1318:23:1318:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1318:23:1318:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1318:23:1318:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1319:13:1319:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1319:13:1319:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1319:13:1319:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1319:13:1319:27 | ... += ... |  | file://:0:0:0:0 | () |
 | main.rs:1319:23:1319:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1319:23:1319:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1319:23:1319:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1319:23:1319:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1325:16:1325:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1325:22:1325:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1325:41:1330:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1750,11 +1876,15 @@ inferType
 | main.rs:1327:20:1327:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1327:29:1327:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1327:29:1327:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1327:29:1327:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1327:29:1327:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1328:20:1328:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1328:20:1328:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1328:20:1328:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1328:29:1328:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1328:29:1328:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1328:29:1328:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1328:29:1328:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1335:23:1335:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1335:23:1335:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1335:34:1335:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1764,12 +1894,16 @@ inferType
 | main.rs:1336:13:1336:27 | ... -= ... |  | file://:0:0:0:0 | () |
 | main.rs:1336:23:1336:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1336:23:1336:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1336:23:1336:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1336:23:1336:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1337:13:1337:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1337:13:1337:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1337:13:1337:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1337:13:1337:27 | ... -= ... |  | file://:0:0:0:0 | () |
 | main.rs:1337:23:1337:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1337:23:1337:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1337:23:1337:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1337:23:1337:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1343:16:1343:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1343:22:1343:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1343:41:1348:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1779,11 +1913,15 @@ inferType
 | main.rs:1345:20:1345:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1345:29:1345:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1345:29:1345:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1345:29:1345:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1345:29:1345:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1346:20:1346:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1346:20:1346:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1346:20:1346:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1346:29:1346:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1346:29:1346:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1346:29:1346:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1346:29:1346:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1352:23:1352:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1352:23:1352:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1352:34:1352:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1793,12 +1931,16 @@ inferType
 | main.rs:1353:13:1353:27 | ... *= ... |  | file://:0:0:0:0 | () |
 | main.rs:1353:23:1353:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1353:23:1353:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1353:23:1353:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1353:23:1353:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1354:13:1354:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1354:13:1354:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1354:13:1354:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1354:13:1354:27 | ... *= ... |  | file://:0:0:0:0 | () |
 | main.rs:1354:23:1354:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1354:23:1354:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1354:23:1354:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1354:23:1354:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1360:16:1360:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1360:22:1360:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1360:41:1365:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1808,11 +1950,15 @@ inferType
 | main.rs:1362:20:1362:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1362:29:1362:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1362:29:1362:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1362:29:1362:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1362:29:1362:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1363:20:1363:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1363:20:1363:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1363:20:1363:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1363:29:1363:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1363:29:1363:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1363:29:1363:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1363:29:1363:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1369:23:1369:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1369:23:1369:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1369:34:1369:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1822,12 +1968,16 @@ inferType
 | main.rs:1370:13:1370:27 | ... /= ... |  | file://:0:0:0:0 | () |
 | main.rs:1370:23:1370:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1370:23:1370:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1370:23:1370:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1370:23:1370:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1371:13:1371:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1371:13:1371:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1371:13:1371:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1371:13:1371:27 | ... /= ... |  | file://:0:0:0:0 | () |
 | main.rs:1371:23:1371:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1371:23:1371:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1371:23:1371:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1371:23:1371:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1377:16:1377:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1377:22:1377:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1377:41:1382:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1837,11 +1987,15 @@ inferType
 | main.rs:1379:20:1379:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1379:29:1379:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1379:29:1379:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1379:29:1379:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1379:29:1379:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1380:20:1380:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1380:20:1380:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1380:20:1380:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1380:29:1380:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1380:29:1380:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1380:29:1380:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1380:29:1380:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1386:23:1386:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1386:23:1386:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1386:34:1386:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1851,12 +2005,16 @@ inferType
 | main.rs:1387:13:1387:27 | ... %= ... |  | file://:0:0:0:0 | () |
 | main.rs:1387:23:1387:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1387:23:1387:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1387:23:1387:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1387:23:1387:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1388:13:1388:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1388:13:1388:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1388:13:1388:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1388:13:1388:27 | ... %= ... |  | file://:0:0:0:0 | () |
 | main.rs:1388:23:1388:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1388:23:1388:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1388:23:1388:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1388:23:1388:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1394:19:1394:22 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1394:25:1394:27 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1394:44:1399:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1866,11 +2024,15 @@ inferType
 | main.rs:1396:20:1396:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1396:29:1396:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1396:29:1396:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1396:29:1396:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1396:29:1396:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1397:20:1397:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1397:20:1397:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1397:20:1397:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1397:29:1397:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1397:29:1397:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1397:29:1397:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1397:29:1397:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1403:26:1403:34 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1403:26:1403:34 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1403:37:1403:39 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1880,12 +2042,16 @@ inferType
 | main.rs:1404:13:1404:27 | ... &= ... |  | file://:0:0:0:0 | () |
 | main.rs:1404:23:1404:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1404:23:1404:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1404:23:1404:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1404:23:1404:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1405:13:1405:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1405:13:1405:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1405:13:1405:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1405:13:1405:27 | ... &= ... |  | file://:0:0:0:0 | () |
 | main.rs:1405:23:1405:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1405:23:1405:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1405:23:1405:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1405:23:1405:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1411:18:1411:21 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1411:24:1411:26 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1411:43:1416:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1895,11 +2061,15 @@ inferType
 | main.rs:1413:20:1413:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1413:29:1413:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1413:29:1413:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1413:29:1413:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1413:29:1413:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1414:20:1414:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1414:20:1414:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1414:20:1414:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1414:29:1414:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1414:29:1414:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1414:29:1414:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1414:29:1414:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1420:25:1420:33 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1420:25:1420:33 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1420:36:1420:38 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1909,12 +2079,16 @@ inferType
 | main.rs:1421:13:1421:27 | ... \|= ... |  | file://:0:0:0:0 | () |
 | main.rs:1421:23:1421:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1421:23:1421:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1421:23:1421:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1421:23:1421:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1422:13:1422:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1422:13:1422:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1422:13:1422:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1422:13:1422:27 | ... \|= ... |  | file://:0:0:0:0 | () |
 | main.rs:1422:23:1422:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1422:23:1422:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1422:23:1422:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1422:23:1422:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1428:19:1428:22 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1428:25:1428:27 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1428:44:1433:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1924,11 +2098,15 @@ inferType
 | main.rs:1430:20:1430:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1430:29:1430:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1430:29:1430:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1430:29:1430:33 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1430:29:1430:33 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1431:20:1431:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1431:20:1431:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1431:20:1431:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1431:29:1431:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1431:29:1431:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1431:29:1431:33 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1431:29:1431:33 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1437:26:1437:34 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1437:26:1437:34 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1437:37:1437:39 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -1938,62 +2116,354 @@ inferType
 | main.rs:1438:13:1438:27 | ... ^= ... |  | file://:0:0:0:0 | () |
 | main.rs:1438:23:1438:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1438:23:1438:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1438:23:1438:27 | rhs.x |  | file://:0:0:0:0 | & |
+| main.rs:1438:23:1438:27 | rhs.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1439:13:1439:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1439:13:1439:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1439:13:1439:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1439:13:1439:27 | ... ^= ... |  | file://:0:0:0:0 | () |
 | main.rs:1439:23:1439:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1439:23:1439:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1439:23:1439:27 | rhs.y |  | file://:0:0:0:0 | & |
+| main.rs:1439:23:1439:27 | rhs.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1445:16:1445:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1445:22:1445:24 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1445:22:1445:24 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1445:40:1450:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1446:13:1449:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1447:20:1447:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1447:20:1447:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1447:20:1447:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1447:30:1447:32 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1447:30:1447:32 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1448:20:1448:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1448:20:1448:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1448:20:1448:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1448:30:1448:32 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1448:30:1448:32 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1454:23:1454:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1454:23:1454:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1454:34:1454:36 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1454:34:1454:36 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1455:13:1455:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1455:13:1455:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1455:13:1455:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1455:13:1455:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1455:24:1455:26 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1455:24:1455:26 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1456:13:1456:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1456:13:1456:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1456:13:1456:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1456:13:1456:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1456:24:1456:26 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1456:24:1456:26 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1462:16:1462:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1462:22:1462:24 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1462:22:1462:24 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1462:40:1467:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1463:13:1466:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1464:20:1464:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1464:20:1464:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1464:20:1464:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1464:30:1464:32 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1464:30:1464:32 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1465:20:1465:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1465:20:1465:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1465:20:1465:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1465:30:1465:32 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1465:30:1465:32 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1471:23:1471:31 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1471:23:1471:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1471:34:1471:36 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1471:34:1471:36 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1472:13:1472:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1472:13:1472:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1472:13:1472:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1472:13:1472:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1472:24:1472:26 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1472:24:1472:26 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1473:13:1473:16 | self |  | file://:0:0:0:0 | & |
 | main.rs:1473:13:1473:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1473:13:1473:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1473:13:1473:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1473:24:1473:26 | rhs |  | file://:0:0:0:0 | & |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1473:24:1473:26 | rhs | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1479:16:1479:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1479:30:1484:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1480:13:1483:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
@@ -2025,6 +2495,8 @@ inferType
 | main.rs:1499:23:1499:27 | other |  | file://:0:0:0:0 | & |
 | main.rs:1499:23:1499:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1499:23:1499:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1499:23:1499:29 | other.x |  | file://:0:0:0:0 | & |
+| main.rs:1499:23:1499:29 | other.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1499:34:1499:37 | self |  | file://:0:0:0:0 | & |
 | main.rs:1499:34:1499:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1499:34:1499:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
@@ -2032,6 +2504,8 @@ inferType
 | main.rs:1499:44:1499:48 | other |  | file://:0:0:0:0 | & |
 | main.rs:1499:44:1499:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1499:44:1499:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1499:44:1499:50 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1499:44:1499:50 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1502:15:1502:19 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1502:15:1502:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1502:22:1502:26 | other |  | file://:0:0:0:0 | & |
@@ -2045,6 +2519,8 @@ inferType
 | main.rs:1503:23:1503:27 | other |  | file://:0:0:0:0 | & |
 | main.rs:1503:23:1503:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1503:23:1503:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1503:23:1503:29 | other.x |  | file://:0:0:0:0 | & |
+| main.rs:1503:23:1503:29 | other.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1503:34:1503:37 | self |  | file://:0:0:0:0 | & |
 | main.rs:1503:34:1503:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1503:34:1503:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
@@ -2052,6 +2528,8 @@ inferType
 | main.rs:1503:44:1503:48 | other |  | file://:0:0:0:0 | & |
 | main.rs:1503:44:1503:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1503:44:1503:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1503:44:1503:50 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1503:44:1503:50 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1508:24:1508:28 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1508:24:1508:28 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1508:31:1508:35 | other |  | file://:0:0:0:0 | & |
@@ -2068,16 +2546,23 @@ inferType
 | main.rs:1509:23:1509:26 | self |  | file://:0:0:0:0 | & |
 | main.rs:1509:23:1509:26 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1509:23:1509:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:23:1509:28 | self.y |  | file://:0:0:0:0 | & |
+| main.rs:1509:23:1509:28 | self.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1509:43:1509:62 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1509:43:1509:62 | &... | &T | {EXTERNAL LOCATION} | Self [trait Ord] |
 | main.rs:1509:43:1509:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:44:1509:62 | (...) |  | {EXTERNAL LOCATION} | Self [trait Ord] |
 | main.rs:1509:44:1509:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1509:45:1509:49 | other |  | file://:0:0:0:0 | & |
 | main.rs:1509:45:1509:49 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1509:45:1509:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:45:1509:61 | ... + ... |  | {EXTERNAL LOCATION} | Self [trait Ord] |
 | main.rs:1509:45:1509:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1509:55:1509:59 | other |  | file://:0:0:0:0 | & |
 | main.rs:1509:55:1509:59 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1509:55:1509:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:55:1509:61 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1509:55:1509:61 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1512:15:1512:19 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1512:15:1512:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1512:22:1512:26 | other |  | file://:0:0:0:0 | & |
@@ -2091,6 +2576,8 @@ inferType
 | main.rs:1513:22:1513:26 | other |  | file://:0:0:0:0 | & |
 | main.rs:1513:22:1513:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1513:22:1513:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1513:22:1513:28 | other.x |  | file://:0:0:0:0 | & |
+| main.rs:1513:22:1513:28 | other.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1513:33:1513:36 | self |  | file://:0:0:0:0 | & |
 | main.rs:1513:33:1513:36 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1513:33:1513:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
@@ -2098,6 +2585,8 @@ inferType
 | main.rs:1513:42:1513:46 | other |  | file://:0:0:0:0 | & |
 | main.rs:1513:42:1513:46 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1513:42:1513:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1513:42:1513:48 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1513:42:1513:48 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1516:15:1516:19 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1516:15:1516:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1516:22:1516:26 | other |  | file://:0:0:0:0 | & |
@@ -2111,6 +2600,8 @@ inferType
 | main.rs:1517:23:1517:27 | other |  | file://:0:0:0:0 | & |
 | main.rs:1517:23:1517:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1517:23:1517:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1517:23:1517:29 | other.x |  | file://:0:0:0:0 | & |
+| main.rs:1517:23:1517:29 | other.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1517:34:1517:37 | self |  | file://:0:0:0:0 | & |
 | main.rs:1517:34:1517:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1517:34:1517:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
@@ -2118,6 +2609,8 @@ inferType
 | main.rs:1517:44:1517:48 | other |  | file://:0:0:0:0 | & |
 | main.rs:1517:44:1517:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1517:44:1517:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1517:44:1517:50 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1517:44:1517:50 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1520:15:1520:19 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1520:15:1520:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1520:22:1520:26 | other |  | file://:0:0:0:0 | & |
@@ -2131,6 +2624,8 @@ inferType
 | main.rs:1521:22:1521:26 | other |  | file://:0:0:0:0 | & |
 | main.rs:1521:22:1521:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1521:22:1521:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1521:22:1521:28 | other.x |  | file://:0:0:0:0 | & |
+| main.rs:1521:22:1521:28 | other.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1521:33:1521:36 | self |  | file://:0:0:0:0 | & |
 | main.rs:1521:33:1521:36 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1521:33:1521:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
@@ -2138,6 +2633,8 @@ inferType
 | main.rs:1521:42:1521:46 | other |  | file://:0:0:0:0 | & |
 | main.rs:1521:42:1521:46 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1521:42:1521:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1521:42:1521:48 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1521:42:1521:48 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1524:15:1524:19 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1524:15:1524:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1524:22:1524:26 | other |  | file://:0:0:0:0 | & |
@@ -2151,6 +2648,8 @@ inferType
 | main.rs:1525:23:1525:27 | other |  | file://:0:0:0:0 | & |
 | main.rs:1525:23:1525:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1525:23:1525:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1525:23:1525:29 | other.x |  | file://:0:0:0:0 | & |
+| main.rs:1525:23:1525:29 | other.x | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1525:34:1525:37 | self |  | file://:0:0:0:0 | & |
 | main.rs:1525:34:1525:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1525:34:1525:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
@@ -2158,126 +2657,268 @@ inferType
 | main.rs:1525:44:1525:48 | other |  | file://:0:0:0:0 | & |
 | main.rs:1525:44:1525:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1525:44:1525:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1525:44:1525:50 | other.y |  | file://:0:0:0:0 | & |
+| main.rs:1525:44:1525:50 | other.y | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1532:13:1532:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1532:22:1532:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1532:23:1532:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1532:23:1532:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1532:31:1532:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1532:31:1532:34 | 2i64 |  | file://:0:0:0:0 | & |
+| main.rs:1532:31:1532:34 | 2i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1533:13:1533:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1533:22:1533:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1533:23:1533:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1533:23:1533:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1533:31:1533:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1533:31:1533:34 | 4i64 |  | file://:0:0:0:0 | & |
+| main.rs:1533:31:1533:34 | 4i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1534:13:1534:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1534:22:1534:34 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1534:23:1534:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1534:23:1534:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1534:30:1534:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1534:30:1534:33 | 6i64 |  | file://:0:0:0:0 | & |
+| main.rs:1534:30:1534:33 | 6i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1535:13:1535:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1535:22:1535:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1535:23:1535:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1535:23:1535:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1535:31:1535:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1535:31:1535:34 | 8i64 |  | file://:0:0:0:0 | & |
+| main.rs:1535:31:1535:34 | 8i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1536:13:1536:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1536:22:1536:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1536:23:1536:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1536:23:1536:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1536:30:1536:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1536:30:1536:34 | 10i64 |  | file://:0:0:0:0 | & |
+| main.rs:1536:30:1536:34 | 10i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1537:13:1537:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1537:22:1537:37 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1537:23:1537:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1537:23:1537:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1537:32:1537:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1537:32:1537:36 | 12i64 |  | file://:0:0:0:0 | & |
+| main.rs:1537:32:1537:36 | 12i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1540:13:1540:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1540:23:1540:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1540:23:1540:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1540:31:1540:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1540:31:1540:35 | 14i64 |  | file://:0:0:0:0 | & |
+| main.rs:1540:31:1540:35 | 14i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1541:13:1541:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1541:23:1541:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1541:23:1541:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1541:31:1541:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1541:31:1541:35 | 16i64 |  | file://:0:0:0:0 | & |
+| main.rs:1541:31:1541:35 | 16i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1542:13:1542:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1542:23:1542:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1542:23:1542:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1542:31:1542:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1542:31:1542:35 | 18i64 |  | file://:0:0:0:0 | & |
+| main.rs:1542:31:1542:35 | 18i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1543:13:1543:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1543:23:1543:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1543:23:1543:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1543:31:1543:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1543:31:1543:35 | 20i64 |  | file://:0:0:0:0 | & |
+| main.rs:1543:31:1543:35 | 20i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1544:13:1544:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1544:23:1544:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1544:23:1544:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1544:31:1544:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1544:31:1544:35 | 22i64 |  | file://:0:0:0:0 | & |
+| main.rs:1544:31:1544:35 | 22i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1547:13:1547:30 | mut i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1547:34:1547:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1548:9:1548:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1548:9:1548:31 | ... += ... |  | file://:0:0:0:0 | () |
 | main.rs:1548:27:1548:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1548:27:1548:31 | 24i64 |  | file://:0:0:0:0 | & |
+| main.rs:1548:27:1548:31 | 24i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1550:13:1550:30 | mut i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1550:34:1550:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1551:9:1551:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1551:9:1551:31 | ... -= ... |  | file://:0:0:0:0 | () |
 | main.rs:1551:27:1551:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1551:27:1551:31 | 26i64 |  | file://:0:0:0:0 | & |
+| main.rs:1551:27:1551:31 | 26i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1553:13:1553:30 | mut i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1553:34:1553:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1554:9:1554:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1554:9:1554:31 | ... *= ... |  | file://:0:0:0:0 | () |
 | main.rs:1554:27:1554:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1554:27:1554:31 | 28i64 |  | file://:0:0:0:0 | & |
+| main.rs:1554:27:1554:31 | 28i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1556:13:1556:30 | mut i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1556:34:1556:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1557:9:1557:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1557:9:1557:31 | ... /= ... |  | file://:0:0:0:0 | () |
 | main.rs:1557:27:1557:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1557:27:1557:31 | 30i64 |  | file://:0:0:0:0 | & |
+| main.rs:1557:27:1557:31 | 30i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1559:13:1559:30 | mut i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1559:34:1559:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1560:9:1560:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1560:9:1560:31 | ... %= ... |  | file://:0:0:0:0 | () |
 | main.rs:1560:27:1560:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1560:27:1560:31 | 32i64 |  | file://:0:0:0:0 | & |
+| main.rs:1560:27:1560:31 | 32i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1563:13:1563:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1563:26:1563:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1563:26:1563:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1563:34:1563:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1563:34:1563:38 | 34i64 |  | file://:0:0:0:0 | & |
+| main.rs:1563:34:1563:38 | 34i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1564:13:1564:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1564:25:1564:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1564:25:1564:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1564:33:1564:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1564:33:1564:37 | 36i64 |  | file://:0:0:0:0 | & |
+| main.rs:1564:33:1564:37 | 36i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1565:13:1565:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1565:26:1565:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1565:26:1565:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1565:34:1565:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1565:34:1565:38 | 38i64 |  | file://:0:0:0:0 | & |
+| main.rs:1565:34:1565:38 | 38i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1566:13:1566:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1566:23:1566:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1566:23:1566:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1566:32:1566:36 | 40i64 |  | file://:0:0:0:0 | & |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1566:32:1566:36 | 40i64 | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1567:13:1567:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1567:23:1567:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1567:23:1567:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1567:32:1567:36 | 42i64 |  | file://:0:0:0:0 | & |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1567:32:1567:36 | 42i64 | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1570:13:1570:33 | mut i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1570:37:1570:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1571:9:1571:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1571:9:1571:34 | ... &= ... |  | file://:0:0:0:0 | () |
 | main.rs:1571:30:1571:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1571:30:1571:34 | 44i64 |  | file://:0:0:0:0 | & |
+| main.rs:1571:30:1571:34 | 44i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1573:13:1573:32 | mut i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1573:36:1573:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1574:9:1574:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1574:9:1574:33 | ... \|= ... |  | file://:0:0:0:0 | () |
 | main.rs:1574:29:1574:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1574:29:1574:33 | 46i64 |  | file://:0:0:0:0 | & |
+| main.rs:1574:29:1574:33 | 46i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1576:13:1576:33 | mut i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1576:37:1576:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1577:9:1577:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1577:9:1577:34 | ... ^= ... |  | file://:0:0:0:0 | () |
 | main.rs:1577:30:1577:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1577:30:1577:34 | 48i64 |  | file://:0:0:0:0 | & |
+| main.rs:1577:30:1577:34 | 48i64 | &T | {EXTERNAL LOCATION} | i64 |
 | main.rs:1579:13:1579:30 | mut i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1579:34:1579:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1580:9:1580:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1580:9:1580:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1580:28:1580:32 | 50i64 |  | file://:0:0:0:0 | & |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1580:28:1580:32 | 50i64 | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1582:13:1582:30 | mut i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1582:34:1582:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1583:9:1583:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1583:9:1583:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | i8 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | i16 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | i128 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | u128 |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | isize |
+| main.rs:1583:28:1583:32 | 52i64 |  | file://:0:0:0:0 | & |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | i8 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | i16 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | i128 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | u8 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | u16 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | u128 |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | usize |
+| main.rs:1583:28:1583:32 | 52i64 | &T | {EXTERNAL LOCATION} | isize |
 | main.rs:1585:13:1585:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1585:23:1585:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1585:24:1585:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
index 3156d05ef173..b1619a0ba808 100644
--- a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,3 +1,8 @@
+multipleMethodCallTargets
+| sqlx.rs:69:30:69:52 | unsafe_query_2.as_str() | file://:0:0:0:0 | fn as_str |
+| sqlx.rs:69:30:69:52 | unsafe_query_2.as_str() | file://:0:0:0:0 | fn as_str |
+| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() | file://:0:0:0:0 | fn as_str |
+| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() | file://:0:0:0:0 | fn as_str |
 multiplePathResolutions
 | sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
 | sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |