From affaf7700a86942f82e4cb25348c719bb928399a Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 2 Mar 2019 20:55:56 +0100 Subject: Represent unknown types as {unknown} instead of [unknown] Since the latter could actually be a real type... --- crates/ra_hir/src/ty.rs | 2 +- crates/ra_hir/src/ty/snapshots/tests__bug_585.snap | 14 ++++---- .../tests__infer_associated_type_bound.snap | 6 ++-- .../src/ty/snapshots/tests__infer_backwards.snap | 12 +++---- .../src/ty/snapshots/tests__infer_binary_op.snap | 8 ++--- ...infer_call_trait_method_on_generic_param_1.snap | 4 +-- ...infer_call_trait_method_on_generic_param_2.snap | 4 +-- .../src/ty/snapshots/tests__infer_const.snap | 6 ++-- .../ty/snapshots/tests__infer_from_bound_1.snap | 14 ++++---- .../ty/snapshots/tests__infer_from_bound_2.snap | 14 ++++---- .../src/ty/snapshots/tests__infer_pattern.snap | 30 ++++++++-------- .../tests__infer_project_associated_type.snap | 6 ++-- .../src/ty/snapshots/tests__infer_static.snap | 10 +++--- .../src/ty/snapshots/tests__infer_std_crash_1.snap | 10 +++--- .../src/ty/snapshots/tests__infer_std_crash_3.snap | 10 +++--- .../src/ty/snapshots/tests__infer_std_crash_4.snap | 16 ++++----- .../src/ty/snapshots/tests__infer_std_crash_5.snap | 40 +++++++++++----------- .../snapshots/tests__infer_trait_assoc_method.snap | 16 ++++----- .../tests__infer_trait_method_generic_1.snap | 6 ++-- .../tests__infer_trait_method_generic_2.snap | 6 ++-- .../tests__infer_trait_method_scoped.snap | 10 +++--- .../tests__infer_trait_method_simple.snap | 10 +++--- .../tests__infer_tuple_struct_generics.snap | 6 ++-- .../src/ty/snapshots/tests__infer_unary_op.snap | 14 ++++---- .../tests__infer_with_multiple_trait_impls.snap | 10 +++--- .../tests__no_panic_on_field_of_enum.snap | 8 ++--- .../src/ty/snapshots/tests__recursive_vars.snap | 18 +++++----- .../src/ty/snapshots/tests__recursive_vars_2.snap | 32 ++++++++--------- crates/ra_ide_api/src/hover.rs | 2 +- 29 files changed, 172 insertions(+), 172 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 78270a9b7..bad811a56 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs @@ -339,7 +339,7 @@ impl fmt::Display for Ty { Ok(()) } Ty::Param { name, .. } => write!(f, "{}", name), - Ty::Unknown => write!(f, "[unknown]"), + Ty::Unknown => write!(f, "{{unknown}}"), Ty::Infer(..) => write!(f, "_"), } } diff --git a/crates/ra_hir/src/ty/snapshots/tests__bug_585.snap b/crates/ra_hir/src/ty/snapshots/tests__bug_585.snap index e7b42e413..4b5630bb6 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__bug_585.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__bug_585.snap @@ -1,15 +1,15 @@ --- -created: "2019-01-22T14:44:59.880187500+00:00" -creator: insta@0.4.0 +created: "2019-03-02T19:54:58.488684667Z" +creator: insta@0.6.3 +source: crates/ra_hir/src/ty/tests.rs expression: "&result" -source: "crates\\ra_hir\\src\\ty\\tests.rs" --- [11; 89) '{ ... } }': () -[17; 21) 'X {}': [unknown] +[17; 21) 'X {}': {unknown} [27; 87) 'match ... }': () -[33; 34) 'x': [unknown] -[45; 52) 'A::B {}': [unknown] +[33; 34) 'x': {unknown} +[45; 52) 'A::B {}': {unknown} [56; 58) '()': () -[68; 74) 'A::Y()': [unknown] +[68; 74) 'A::Y()': {unknown} [78; 80) '()': () diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_associated_type_bound.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_associated_type_bound.snap index 4dbde99f9..c9ec055f2 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_associated_type_bound.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_associated_type_bound.snap @@ -1,10 +1,10 @@ --- -created: "2019-03-02T13:52:02.767222917Z" +created: "2019-03-02T19:54:58.491748649Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [67; 100) '{ ...own; }': () -[77; 78) 'y': [unknown] -[90; 97) 'unknown': [unknown] +[77; 78) 'y': {unknown} +[90; 97) 'unknown': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_backwards.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_backwards.snap index f5840a934..7d6091f6c 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_backwards.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_backwards.snap @@ -1,25 +1,25 @@ --- -created: "2019-01-26T17:46:03.842478456+00:00" -creator: insta@0.5.2 -expression: "&result" +created: "2019-03-02T19:54:58.494864698Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs +expression: "&result" --- [14; 15) 'x': u32 [22; 24) '{}': () [78; 231) '{ ...t &c }': &mut &f64 [88; 89) 'a': u32 -[92; 108) 'unknow...nction': [unknown] +[92; 108) 'unknow...nction': {unknown} [92; 110) 'unknow...tion()': u32 [116; 125) 'takes_u32': fn takes_u32(u32) -> () [116; 128) 'takes_u32(a)': () [126; 127) 'a': u32 [138; 139) 'b': i32 -[142; 158) 'unknow...nction': [unknown] +[142; 158) 'unknow...nction': {unknown} [142; 160) 'unknow...tion()': i32 [166; 184) 'S { i3...d: b }': S [181; 182) 'b': i32 [194; 195) 'c': f64 -[198; 214) 'unknow...nction': [unknown] +[198; 214) 'unknow...nction': {unknown} [198; 216) 'unknow...tion()': f64 [222; 229) '&mut &c': &mut &f64 [227; 229) '&c': &f64 diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_binary_op.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_binary_op.snap index 80ffe6e11..c8796b29b 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_binary_op.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_binary_op.snap @@ -1,6 +1,6 @@ --- -created: "2019-02-18T07:03:52.524808301Z" -creator: insta@0.6.2 +created: "2019-03-02T19:54:58.498001346Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- @@ -39,8 +39,8 @@ expression: "&result" [232; 238) 'z || y': bool [237; 238) 'y': bool [242; 243) '5': i32 -[253; 254) 'd': [unknown] -[257; 258) 'b': [unknown] +[253; 254) 'd': {unknown} +[257; 258) 'b': {unknown} [268; 269) 'g': () [272; 283) 'minus_forty': isize [272; 288) 'minus_...y ^= i': () diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_1.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_1.snap index c56e6ba42..183171b02 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_1.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_1.snap @@ -1,5 +1,5 @@ --- -created: "2019-03-02T13:49:53.509955706Z" +created: "2019-03-02T19:54:58.492145019Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" @@ -7,5 +7,5 @@ expression: "&result" [59; 60) 't': T [65; 84) '{ ...d(); }': () [71; 72) 't': T -[71; 81) 't.method()': [unknown] +[71; 81) 't.method()': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_2.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_2.snap index 7791a57da..3b419d93c 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_2.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_call_trait_method_on_generic_param_2.snap @@ -1,5 +1,5 @@ --- -created: "2019-03-02T13:49:53.477633667Z" +created: "2019-03-02T19:54:58.495889098Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" @@ -7,5 +7,5 @@ expression: "&result" [66; 67) 't': T [72; 91) '{ ...d(); }': () [78; 79) 't': T -[78; 88) 't.method()': [unknown] +[78; 88) 't.method()': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_const.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_const.snap index a5eba3980..5382cb71a 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_const.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_const.snap @@ -1,12 +1,12 @@ --- -created: "2019-02-25T07:26:34.115351100Z" +created: "2019-03-02T19:54:58.498050919Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [95; 213) '{ ...NST; }': () -[138; 139) 'x': [unknown] -[142; 153) 'LOCAL_CONST': [unknown] +[138; 139) 'x': {unknown} +[142; 153) 'LOCAL_CONST': {unknown} [163; 164) 'z': u32 [167; 179) 'GLOBAL_CONST': u32 [189; 191) 'id': u32 diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_1.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_1.snap index c8d8e9806..6ff04bd8f 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_1.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_1.snap @@ -1,5 +1,5 @@ --- -created: "2019-03-02T13:49:53.558635265Z" +created: "2019-03-02T19:54:58.513042571Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" @@ -7,11 +7,11 @@ expression: "&result" [86; 87) 't': T [92; 94) '{}': () [105; 144) '{ ...(s); }': () -[115; 116) 's': S<[unknown]> -[119; 120) 'S': S<[unknown]>(T) -> S -[119; 129) 'S(unknown)': S<[unknown]> -[121; 128) 'unknown': [unknown] -[135; 138) 'foo': fn foo>(T) -> () +[115; 116) 's': S<{unknown}> +[119; 120) 'S': S<{unknown}>(T) -> S +[119; 129) 'S(unknown)': S<{unknown}> +[121; 128) 'unknown': {unknown} +[135; 138) 'foo': fn foo>(T) -> () [135; 141) 'foo(s)': () -[139; 140) 's': S<[unknown]> +[139; 140) 's': S<{unknown}> diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_2.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_2.snap index 37def29c3..8a0365145 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_2.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_from_bound_2.snap @@ -1,5 +1,5 @@ --- -created: "2019-03-02T13:49:53.572131028Z" +created: "2019-03-02T19:54:58.520601712Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" @@ -7,12 +7,12 @@ expression: "&result" [87; 88) 't': T [98; 100) '{}': () [111; 163) '{ ...(s); }': () -[121; 122) 's': S<[unknown]> -[125; 126) 'S': S<[unknown]>(T) -> S -[125; 135) 'S(unknown)': S<[unknown]> -[127; 134) 'unknown': [unknown] +[121; 122) 's': S<{unknown}> +[125; 126) 'S': S<{unknown}>(T) -> S +[125; 135) 'S(unknown)': S<{unknown}> +[127; 134) 'unknown': {unknown} [145; 146) 'x': u32 -[154; 157) 'foo': fn foo>(T) -> U +[154; 157) 'foo': fn foo>(T) -> U [154; 160) 'foo(s)': u32 -[158; 159) 's': S<[unknown]> +[158; 159) 's': S<{unknown}> diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_pattern.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_pattern.snap index 1da46daf8..06ef0007c 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_pattern.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_pattern.snap @@ -1,8 +1,8 @@ --- -created: "2019-01-22T14:45:00.037734500+00:00" -creator: insta@0.4.0 +created: "2019-03-02T19:54:58.538812297Z" +creator: insta@0.6.3 +source: crates/ra_hir/src/ty/tests.rs expression: "&result" -source: "crates\\ra_hir\\src\\ty\\tests.rs" --- [9; 10) 'x': &i32 [18; 369) '{ ...o_x; }': () @@ -20,21 +20,21 @@ source: "crates\\ra_hir\\src\\ty\\tests.rs" [84; 85) '1': i32 [87; 94) '"hello"': &str [102; 152) 'for (e... }': () -[106; 112) '(e, f)': ([unknown], [unknown]) -[107; 108) 'e': [unknown] -[110; 111) 'f': [unknown] -[116; 125) 'some_iter': [unknown] +[106; 112) '(e, f)': ({unknown}, {unknown}) +[107; 108) 'e': {unknown} +[110; 111) 'f': {unknown} +[116; 125) 'some_iter': {unknown} [126; 152) '{ ... }': () -[140; 141) 'g': [unknown] -[144; 145) 'e': [unknown] +[140; 141) 'g': {unknown} +[144; 145) 'e': {unknown} [158; 205) 'if let... }': () -[165; 170) '[val]': [unknown] -[173; 176) 'opt': [unknown] +[165; 170) '[val]': {unknown} +[173; 176) 'opt': {unknown} [177; 205) '{ ... }': () -[191; 192) 'h': [unknown] -[195; 198) 'val': [unknown] -[215; 221) 'lambda': [unknown] -[224; 256) '|a: u6...b; c }': [unknown] +[191; 192) 'h': {unknown} +[195; 198) 'val': {unknown} +[215; 221) 'lambda': {unknown} +[224; 256) '|a: u6...b; c }': {unknown} [225; 226) 'a': u64 [233; 234) 'b': u64 [236; 237) 'c': i32 diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_project_associated_type.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_project_associated_type.snap index 6d5331799..e18815aba 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_project_associated_type.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_project_associated_type.snap @@ -1,5 +1,5 @@ --- -created: "2019-03-02T13:49:53.680954394Z" +created: "2019-03-02T19:54:58.534200832Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" @@ -7,6 +7,6 @@ expression: "&result" [108; 181) '{ ...ter; }': () [118; 119) 'x': i32 [145; 146) '1': i32 -[156; 157) 'y': [unknown] -[169; 178) 'no_matter': [unknown] +[156; 157) 'y': {unknown} +[169; 178) 'no_matter': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_static.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_static.snap index 5d90f56ed..e6ae195c4 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_static.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_static.snap @@ -1,14 +1,14 @@ --- -created: "2019-02-25T08:20:17.807316Z" +created: "2019-03-02T19:54:58.534478182Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [85; 280) '{ ...MUT; }': () -[173; 174) 'x': [unknown] -[177; 189) 'LOCAL_STATIC': [unknown] -[199; 200) 'y': [unknown] -[203; 219) 'LOCAL_...IC_MUT': [unknown] +[173; 174) 'x': {unknown} +[177; 189) 'LOCAL_STATIC': {unknown} +[199; 200) 'y': {unknown} +[203; 219) 'LOCAL_...IC_MUT': {unknown} [229; 230) 'z': u32 [233; 246) 'GLOBAL_STATIC': u32 [256; 257) 'w': u32 diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_1.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_1.snap index 4b99788e4..56b63cbe7 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_1.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_1.snap @@ -1,13 +1,13 @@ --- -created: "2019-02-09T16:56:24.803326529Z" -creator: insta@0.6.1 +created: "2019-03-02T19:54:58.539061212Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [54; 139) '{ ... } }': () [60; 137) 'match ... }': () -[66; 83) 'someth...nknown': Maybe<[unknown]> -[94; 124) 'Maybe:...thing)': Maybe<[unknown]> -[106; 123) 'ref mu...ething': &mut [unknown] +[66; 83) 'someth...nknown': Maybe<{unknown}> +[94; 124) 'Maybe:...thing)': Maybe<{unknown}> +[106; 123) 'ref mu...ething': &mut {unknown} [128; 130) '()': () diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_3.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_3.snap index d15b77e17..fd47f80b7 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_3.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_3.snap @@ -1,13 +1,13 @@ --- -created: "2019-02-09T18:02:37.377591660Z" -creator: insta@0.6.1 +created: "2019-03-02T19:54:58.534201681Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [18; 102) '{ ... } }': () [24; 100) 'match ... }': () -[42; 88) 'SizeSk...tail }': [unknown] -[76; 80) 'true': [unknown] -[82; 86) 'tail': [unknown] +[42; 88) 'SizeSk...tail }': {unknown} +[76; 80) 'true': {unknown} +[82; 86) 'tail': {unknown} [92; 94) '{}': () diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_4.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_4.snap index fb31883ce..14254c46a 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_4.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_4.snap @@ -1,16 +1,16 @@ --- -created: "2019-02-09T19:55:39.712470520Z" -creator: insta@0.6.1 +created: "2019-03-02T19:54:58.539815103Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [25; 110) '{ ... } }': () [31; 108) 'match ... }': () -[37; 42) '*self': [unknown] -[38; 42) 'self': [unknown] -[53; 95) 'Borrow...), ..}': [unknown] -[74; 77) 'box': [unknown] -[78; 87) 'Primitive': [unknown] -[88; 89) 'p': [unknown] +[37; 42) '*self': {unknown} +[38; 42) 'self': {unknown} +[53; 95) 'Borrow...), ..}': {unknown} +[74; 77) 'box': {unknown} +[78; 87) 'Primitive': {unknown} +[88; 89) 'p': {unknown} [99; 101) '{}': () diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_5.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_5.snap index 6bbf59fb6..27853bf1a 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_5.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_std_crash_5.snap @@ -1,30 +1,30 @@ --- -created: "2019-02-09T20:28:37.294693728Z" -creator: insta@0.6.1 +created: "2019-03-02T19:54:58.546324340Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [27; 323) '{ ... } }': () [33; 321) 'for co... }': () -[37; 44) 'content': &[unknown] -[48; 61) 'doesnt_matter': [unknown] +[37; 44) 'content': &{unknown} +[48; 61) 'doesnt_matter': {unknown} [62; 321) '{ ... }': () -[76; 80) 'name': &&[unknown] -[83; 167) 'if doe... }': &&[unknown] +[76; 80) 'name': &&{unknown} +[83; 167) 'if doe... }': &&{unknown} [86; 99) 'doesnt_matter': bool -[100; 129) '{ ... }': &&[unknown] -[114; 119) 'first': &&[unknown] -[135; 167) '{ ... }': &&[unknown] -[149; 157) '&content': &&[unknown] -[150; 157) 'content': &[unknown] -[182; 189) 'content': &&[unknown] -[192; 314) 'if ICE... }': &&[unknown] -[195; 232) 'ICE_RE..._VALUE': [unknown] +[100; 129) '{ ... }': &&{unknown} +[114; 119) 'first': &&{unknown} +[135; 167) '{ ... }': &&{unknown} +[149; 157) '&content': &&{unknown} +[150; 157) 'content': &{unknown} +[182; 189) 'content': &&{unknown} +[192; 314) 'if ICE... }': &&{unknown} +[195; 232) 'ICE_RE..._VALUE': {unknown} [195; 248) 'ICE_RE...&name)': bool -[242; 247) '&name': &&&[unknown] -[243; 247) 'name': &&[unknown] -[249; 277) '{ ... }': &&[unknown] -[263; 267) 'name': &&[unknown] -[283; 314) '{ ... }': &[unknown] -[297; 304) 'content': &[unknown] +[242; 247) '&name': &&&{unknown} +[243; 247) 'name': &&{unknown} +[249; 277) '{ ... }': &&{unknown} +[263; 267) 'name': &&{unknown} +[283; 314) '{ ... }': &{unknown} +[297; 304) 'content': &{unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_trait_assoc_method.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_trait_assoc_method.snap index c09e1cf44..b36d0ecda 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_trait_assoc_method.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_trait_assoc_method.snap @@ -1,17 +1,17 @@ --- -created: "2019-03-02T13:49:53.756157395Z" +created: "2019-03-02T19:54:58.553776959Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- [87; 193) '{ ...t(); }': () [97; 99) 's1': S -[105; 121) 'Defaul...efault': [unknown] +[105; 121) 'Defaul...efault': {unknown} [105; 123) 'Defaul...ault()': S -[133; 135) 's2': [unknown] -[138; 148) 'S::default': [unknown] -[138; 150) 'S::default()': [unknown] -[160; 162) 's3': [unknown] -[165; 188) '(T) -> S [108; 115) 'S(1u32)': S -[108; 124) 'S(1u32...thod()': [unknown] +[108; 124) 'S(1u32...thod()': {unknown} [110; 114) '1u32': u32 diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_scoped.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_scoped.snap index f2cce656d..d53ae14fc 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_scoped.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_scoped.snap @@ -1,15 +1,15 @@ --- -created: "2019-03-02T15:41:07.568155273Z" +created: "2019-03-02T19:54:58.562251445Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- -[63; 67) 'self': &[unknown] -[169; 173) 'self': &[unknown] +[63; 67) 'self': &{unknown} +[169; 173) 'self': &{unknown} [300; 337) '{ ... }': () [310; 311) 'S': S -[310; 320) 'S.method()': [unknown] +[310; 320) 'S.method()': {unknown} [416; 454) '{ ... }': () [426; 427) 'S': S -[426; 436) 'S.method()': [unknown] +[426; 436) 'S.method()': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_simple.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_simple.snap index 22e83722d..ff1c483f1 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_simple.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_trait_method_simple.snap @@ -1,14 +1,14 @@ --- -created: "2019-03-02T15:41:07.562949721Z" +created: "2019-03-02T19:54:58.558393608Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- -[31; 35) 'self': &[unknown] -[110; 114) 'self': &[unknown] +[31; 35) 'self': &{unknown} +[110; 114) 'self': &{unknown} [170; 228) '{ ...i128 }': () [176; 178) 'S1': S1 -[176; 187) 'S1.method()': [unknown] +[176; 187) 'S1.method()': {unknown} [203; 205) 'S2': S2 -[203; 214) 'S2.method()': [unknown] +[203; 214) 'S2.method()': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_tuple_struct_generics.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_tuple_struct_generics.snap index 783795cfd..5246794fe 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_tuple_struct_generics.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_tuple_struct_generics.snap @@ -1,6 +1,6 @@ --- -created: "2019-02-20T21:31:12.911275141Z" -creator: insta@0.6.2 +created: "2019-03-02T19:54:58.566211313Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- @@ -17,7 +17,7 @@ expression: "&result" [124; 136) 'Option::Some': Some<&str>(T) -> Option [124; 141) 'Option...e("x")': Option<&str> [137; 140) '"x"': &str -[147; 151) 'None': Option<[unknown]> +[147; 151) 'None': Option<{unknown}> [161; 162) 'x': Option [178; 182) 'None': Option diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap index 5021d0eeb..ce0d3c60d 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap @@ -1,8 +1,8 @@ --- -created: "2019-01-28T14:51:16.185273502+00:00" -creator: insta@0.5.2 -expression: "&result" +created: "2019-03-02T19:54:58.571163594Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs +expression: "&result" --- [27; 28) 'x': SomeType [40; 272) '{ ...lo"; }': () @@ -37,12 +37,12 @@ source: crates/ra_hir/src/ty/tests.rs [213; 217) '3.14': f64 [223; 225) '!3': i32 [224; 225) '3': i32 -[231; 233) '-x': [unknown] +[231; 233) '-x': {unknown} [232; 233) 'x': SomeType -[239; 241) '!x': [unknown] +[239; 241) '!x': {unknown} [240; 241) 'x': SomeType -[247; 255) '-"hello"': [unknown] +[247; 255) '-"hello"': {unknown} [248; 255) '"hello"': &str -[261; 269) '!"hello"': [unknown] +[261; 269) '!"hello"': {unknown} [262; 269) '"hello"': &str diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_with_multiple_trait_impls.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_with_multiple_trait_impls.snap index 82c8bae58..a7704ecce 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__infer_with_multiple_trait_impls.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__infer_with_multiple_trait_impls.snap @@ -1,10 +1,10 @@ --- -created: "2019-03-02T13:49:53.860659428Z" +created: "2019-03-02T19:54:58.573565546Z" creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs expression: "&result" --- -[29; 33) 'self': [unknown] +[29; 33) 'self': {unknown} [107; 198) '{ ...(S); }': () [117; 118) 'x': u32 [126; 127) 'S': S @@ -12,8 +12,8 @@ expression: "&result" [144; 145) 'y': u64 [153; 154) 'S': S [153; 161) 'S.into()': u64 -[171; 172) 'z': [unknown] -[175; 192) 'Into::...::into': [unknown] -[175; 195) 'Into::...nto(S)': [unknown] +[171; 172) 'z': {unknown} +[175; 192) 'Into::...::into': {unknown} +[175; 195) 'Into::...nto(S)': {unknown} [193; 194) 'S': S diff --git a/crates/ra_hir/src/ty/snapshots/tests__no_panic_on_field_of_enum.snap b/crates/ra_hir/src/ty/snapshots/tests__no_panic_on_field_of_enum.snap index b6f404b4c..cf0dc719e 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__no_panic_on_field_of_enum.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__no_panic_on_field_of_enum.snap @@ -1,11 +1,11 @@ --- -created: "2019-01-22T14:45:00.058678600+00:00" -creator: insta@0.4.0 +created: "2019-03-02T19:54:58.571647281Z" +creator: insta@0.6.3 +source: crates/ra_hir/src/ty/tests.rs expression: "&result" -source: "crates\\ra_hir\\src\\ty\\tests.rs" --- [20; 21) 'x': X [26; 47) '{ ...eld; }': () [32; 33) 'x': X -[32; 44) 'x.some_field': [unknown] +[32; 44) 'x.some_field': {unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__recursive_vars.snap b/crates/ra_hir/src/ty/snapshots/tests__recursive_vars.snap index c3227ff7e..1a4388b50 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__recursive_vars.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__recursive_vars.snap @@ -1,14 +1,14 @@ --- -created: "2019-01-26T22:42:22.329980185+00:00" -creator: insta@0.5.2 -expression: "&result" +created: "2019-03-02T19:54:58.571823250Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs +expression: "&result" --- [11; 48) '{ ...&y]; }': () -[21; 22) 'y': &[unknown] -[25; 32) 'unknown': &[unknown] -[38; 45) '[y, &y]': [&&[unknown]] -[39; 40) 'y': &[unknown] -[42; 44) '&y': &&[unknown] -[43; 44) 'y': &[unknown] +[21; 22) 'y': &{unknown} +[25; 32) 'unknown': &{unknown} +[38; 45) '[y, &y]': [&&{unknown}] +[39; 40) 'y': &{unknown} +[42; 44) '&y': &&{unknown} +[43; 44) 'y': &{unknown} diff --git a/crates/ra_hir/src/ty/snapshots/tests__recursive_vars_2.snap b/crates/ra_hir/src/ty/snapshots/tests__recursive_vars_2.snap index de124da5b..444644639 100644 --- a/crates/ra_hir/src/ty/snapshots/tests__recursive_vars_2.snap +++ b/crates/ra_hir/src/ty/snapshots/tests__recursive_vars_2.snap @@ -1,21 +1,21 @@ --- -created: "2019-01-26T22:42:22.331805845+00:00" -creator: insta@0.5.2 -expression: "&result" +created: "2019-03-02T19:54:58.575200890Z" +creator: insta@0.6.3 source: crates/ra_hir/src/ty/tests.rs +expression: "&result" --- [11; 80) '{ ...x)]; }': () -[21; 22) 'x': &&[unknown] -[25; 32) 'unknown': &&[unknown] -[42; 43) 'y': &&[unknown] -[46; 53) 'unknown': &&[unknown] -[59; 77) '[(x, y..., &x)]': [(&&[unknown], &&[unknown])] -[60; 66) '(x, y)': (&&[unknown], &&[unknown]) -[61; 62) 'x': &&[unknown] -[64; 65) 'y': &&[unknown] -[68; 76) '(&y, &x)': (&&&[unknown], &&&[unknown]) -[69; 71) '&y': &&&[unknown] -[70; 71) 'y': &&[unknown] -[73; 75) '&x': &&&[unknown] -[74; 75) 'x': &&[unknown] +[21; 22) 'x': &&{unknown} +[25; 32) 'unknown': &&{unknown} +[42; 43) 'y': &&{unknown} +[46; 53) 'unknown': &&{unknown} +[59; 77) '[(x, y..., &x)]': [(&&{unknown}, &&{unknown})] +[60; 66) '(x, y)': (&&{unknown}, &&{unknown}) +[61; 62) 'x': &&{unknown} +[64; 65) 'y': &&{unknown} +[68; 76) '(&y, &x)': (&&&{unknown}, &&&{unknown}) +[69; 71) '&y': &&&{unknown} +[70; 71) 'y': &&{unknown} +[73; 75) '&x': &&&{unknown} +[74; 75) 'x': &&{unknown} diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs index 4722206e2..8ec60090d 100644 --- a/crates/ra_ide_api/src/hover.rs +++ b/crates/ra_ide_api/src/hover.rs @@ -474,7 +474,7 @@ mod tests { ); let type_name = analysis.type_of(range).unwrap().unwrap(); - assert_eq!("[unknown]", &type_name); + assert_eq!("{unknown}", &type_name); } #[test] -- cgit v1.2.3