aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock16
-rw-r--r--crates/ra_assists/src/assist_ctx.rs8
-rw-r--r--crates/ra_assists/src/handlers/add_custom_impl.rs10
-rw-r--r--crates/ra_assists/src/handlers/add_derive.rs8
-rw-r--r--crates/ra_assists/src/handlers/add_explicit_type.rs4
-rw-r--r--crates/ra_assists/src/handlers/add_from_impl_for_enum.rs4
-rw-r--r--crates/ra_assists/src/handlers/add_function.rs8
-rw-r--r--crates/ra_assists/src/handlers/add_impl.rs4
-rw-r--r--crates/ra_assists/src/handlers/add_new.rs8
-rw-r--r--crates/ra_assists/src/handlers/apply_demorgan.rs2
-rw-r--r--crates/ra_assists/src/handlers/change_visibility.rs4
-rw-r--r--crates/ra_assists/src/handlers/flip_binexpr.rs2
-rw-r--r--crates/ra_assists/src/handlers/inline_local_variable.rs2
-rw-r--r--crates/ra_assists/src/handlers/introduce_variable.rs6
-rw-r--r--crates/ra_assists/src/handlers/invert_if.rs2
-rw-r--r--crates/ra_assists/src/handlers/merge_match_arms.rs10
-rw-r--r--crates/ra_assists/src/handlers/move_guard.rs10
-rw-r--r--crates/ra_assists/src/handlers/raw_string.rs4
-rw-r--r--crates/ra_assists/src/handlers/remove_dbg.rs8
-rw-r--r--crates/ra_assists/src/handlers/remove_mut.rs2
-rw-r--r--crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs2
-rw-r--r--crates/ra_assists/src/lib.rs9
-rw-r--r--crates/ra_db/src/lib.rs4
-rw-r--r--crates/ra_hir/src/code_model.rs34
-rw-r--r--crates/ra_hir/src/from_id.rs22
-rw-r--r--crates/ra_hir/src/has_source.rs6
-rw-r--r--crates/ra_hir/src/lib.rs4
-rw-r--r--crates/ra_hir/src/semantics.rs45
-rw-r--r--crates/ra_hir/src/semantics/source_to_def.rs8
-rw-r--r--crates/ra_hir/src/source_analyzer.rs40
-rw-r--r--crates/ra_hir_def/src/adt.rs22
-rw-r--r--crates/ra_hir_def/src/attr.rs2
-rw-r--r--crates/ra_hir_def/src/body/scope.rs2
-rw-r--r--crates/ra_hir_def/src/child_by_source.rs6
-rw-r--r--crates/ra_hir_def/src/docs.rs2
-rw-r--r--crates/ra_hir_def/src/keys.rs6
-rw-r--r--crates/ra_hir_def/src/lib.rs10
-rw-r--r--crates/ra_hir_expand/src/builtin_macro.rs6
-rw-r--r--crates/ra_hir_expand/src/lib.rs4
-rw-r--r--crates/ra_hir_ty/src/db.rs4
-rw-r--r--crates/ra_hir_ty/src/expr.rs14
-rw-r--r--crates/ra_hir_ty/src/infer.rs16
-rw-r--r--crates/ra_hir_ty/src/infer/expr.rs8
-rw-r--r--crates/ra_hir_ty/src/infer/pat.rs4
-rw-r--r--crates/ra_hir_ty/src/lower.rs6
-rw-r--r--crates/ra_hir_ty/src/tests.rs4
-rw-r--r--crates/ra_hir_ty/src/tests/coercion.rs582
-rw-r--r--crates/ra_hir_ty/src/tests/macros.rs202
-rw-r--r--crates/ra_hir_ty/src/tests/method_resolution.rs376
-rw-r--r--crates/ra_hir_ty/src/tests/patterns.rs480
-rw-r--r--crates/ra_hir_ty/src/tests/regression.rs278
-rw-r--r--crates/ra_hir_ty/src/tests/simple.rs1360
-rw-r--r--crates/ra_hir_ty/src/tests/traits.rs1106
-rw-r--r--crates/ra_ide/src/call_hierarchy.rs36
-rw-r--r--crates/ra_ide/src/call_info.rs2
-rw-r--r--crates/ra_ide/src/completion/complete_attribute.rs240
-rw-r--r--crates/ra_ide/src/completion/complete_dot.rs112
-rw-r--r--crates/ra_ide/src/completion/complete_fn_param.rs12
-rw-r--r--crates/ra_ide/src/completion/complete_keyword.rs254
-rw-r--r--crates/ra_ide/src/completion/complete_macro_in_item_position.rs16
-rw-r--r--crates/ra_ide/src/completion/complete_pattern.rs28
-rw-r--r--crates/ra_ide/src/completion/complete_postfix.rs134
-rw-r--r--crates/ra_ide/src/completion/complete_qualified_path.rs156
-rw-r--r--crates/ra_ide/src/completion/complete_record.rs60
-rw-r--r--crates/ra_ide/src/completion/complete_snippet.rs20
-rw-r--r--crates/ra_ide/src/completion/complete_trait_impl.rs53
-rw-r--r--crates/ra_ide/src/completion/complete_unqualified_path.rs320
-rw-r--r--crates/ra_ide/src/completion/completion_context.rs13
-rw-r--r--crates/ra_ide/src/completion/presentation.rs207
-rw-r--r--crates/ra_ide/src/diagnostics.rs10
-rw-r--r--crates/ra_ide/src/display/navigation_target.rs4
-rw-r--r--crates/ra_ide/src/display/structure.rs76
-rw-r--r--crates/ra_ide/src/extend_selection.rs44
-rw-r--r--crates/ra_ide/src/folding_ranges.rs7
-rw-r--r--crates/ra_ide/src/goto_definition.rs90
-rw-r--r--crates/ra_ide/src/goto_type_definition.rs10
-rw-r--r--crates/ra_ide/src/hover.rs6
-rw-r--r--crates/ra_ide/src/impls.rs20
-rw-r--r--crates/ra_ide/src/inlay_hints.rs166
-rw-r--r--crates/ra_ide/src/join_lines.rs40
-rw-r--r--crates/ra_ide/src/lib.rs4
-rw-r--r--crates/ra_ide/src/matching_brace.rs4
-rw-r--r--crates/ra_ide/src/parent_module.rs6
-rw-r--r--crates/ra_ide/src/references.rs92
-rw-r--r--crates/ra_ide/src/references/rename.rs25
-rw-r--r--crates/ra_ide/src/runnables.rs18
-rw-r--r--crates/ra_ide/src/source_change.rs4
-rw-r--r--crates/ra_ide/src/syntax_highlighting.rs14
-rw-r--r--crates/ra_ide/src/syntax_highlighting/html.rs14
-rw-r--r--crates/ra_ide/src/syntax_highlighting/tests.rs2
-rw-r--r--crates/ra_ide/src/syntax_tree.rs277
-rw-r--r--crates/ra_ide/src/test_utils.rs4
-rw-r--r--crates/ra_ide/src/typing.rs25
-rw-r--r--crates/ra_ide/src/typing/on_enter.rs6
-rw-r--r--crates/ra_ide_db/src/defs.rs22
-rw-r--r--crates/ra_ide_db/src/line_index.rs66
-rw-r--r--crates/ra_ide_db/src/line_index_utils.rs51
-rw-r--r--crates/ra_ide_db/src/search.rs22
-rw-r--r--crates/ra_mbe/src/syntax_bridge.rs69
-rw-r--r--crates/ra_mbe/src/tests.rs421
-rw-r--r--crates/ra_project_model/src/lib.rs12
-rw-r--r--crates/ra_syntax/Cargo.toml2
-rw-r--r--crates/ra_syntax/src/algo.rs12
-rw-r--r--crates/ra_syntax/src/ast/tokens.rs39
-rw-r--r--crates/ra_syntax/src/fuzz.rs15
-rw-r--r--crates/ra_syntax/src/lib.rs4
-rw-r--r--crates/ra_syntax/src/parsing/lexer.rs32
-rw-r--r--crates/ra_syntax/src/parsing/reparsing.rs4
-rw-r--r--crates/ra_syntax/src/parsing/text_token_source.rs8
-rw-r--r--crates/ra_syntax/src/parsing/text_tree_sink.rs14
-rw-r--r--crates/ra_syntax/src/ptr.rs2
-rw-r--r--crates/ra_syntax/src/syntax_error.rs6
-rw-r--r--crates/ra_syntax/src/syntax_node.rs4
-rw-r--r--crates/ra_syntax/src/tests.rs8
-rw-r--r--crates/ra_syntax/src/validation.rs6
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt2
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0055_empty_int.txt26
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.txt28
-rw-r--r--crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt4
-rw-r--r--crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast68
-rw-r--r--crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast36
-rw-r--r--crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast78
-rw-r--r--crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast76
-rw-r--r--crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast120
-rw-r--r--crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast148
-rw-r--r--crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast66
-rw-r--r--crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast162
-rw-r--r--crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast116
-rw-r--r--crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast90
-rw-r--r--crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast26
-rw-r--r--crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast636
-rw-r--r--crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast178
-rw-r--r--crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast64
-rw-r--r--crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast48
-rw-r--r--crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast88
-rw-r--r--crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast94
-rw-r--r--crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast264
-rw-r--r--crates/ra_syntax/test_data/parser/err/0019_let_recover.rast214
-rw-r--r--crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast42
-rw-r--r--crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast70
-rw-r--r--crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast366
-rw-r--r--crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast88
-rw-r--r--crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast642
-rw-r--r--crates/ra_syntax/test_data/parser/err/0025_nope.rast408
-rw-r--r--crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast98
-rw-r--r--crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast58
-rw-r--r--crates/ra_syntax/test_data/parser/err/0029_field_completion.rast72
-rw-r--r--crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast250
-rw-r--r--crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast408
-rw-r--r--crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast134
-rw-r--r--crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast192
-rw-r--r--crates/ra_syntax/test_data/parser/err/0035_use_recover.rast108
-rw-r--r--crates/ra_syntax/test_data/parser/err/0036_partial_use.rast102
-rw-r--r--crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast198
-rw-r--r--crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast60
-rw-r--r--crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast166
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast54
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast58
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast34
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast158
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast46
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast74
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast64
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast52
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast122
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast106
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast82
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast42
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast118
-rw-r--r--crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast98
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast144
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast270
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast124
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast120
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast76
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast242
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast80
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast194
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast52
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast18
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast120
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast66
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast70
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast26
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast74
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast26
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast42
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast148
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast90
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast118
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast160
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast106
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast26
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast84
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast34
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast210
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast100
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast180
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast418
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast178
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast196
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast100
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast110
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast44
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast158
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast58
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast110
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast126
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast250
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast296
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast276
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast60
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast94
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast40
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast36
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast166
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast44
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast28
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast140
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast192
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast88
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast154
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast222
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast34
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast166
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast120
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast20
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast250
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast134
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast46
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast264
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast304
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast30
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast92
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast74
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast106
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast192
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast58
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast40
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast126
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast180
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast80
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast52
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast28
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast192
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast486
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast110
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast174
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast38
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast272
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast72
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast138
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast36
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast44
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast26
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast46
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast68
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast30
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast58
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast260
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast38
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast206
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast72
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast34
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast266
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast110
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast82
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast280
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast126
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast78
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast136
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast76
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast180
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast256
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast114
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast128
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast82
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast80
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast96
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast162
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast292
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast132
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast100
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast34
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast64
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast96
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast198
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast118
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast74
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast74
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast258
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast66
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast62
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast180
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast112
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast128
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast140
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast112
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast132
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast52
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast70
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast84
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast222
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast912
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast152
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast46
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast90
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast42
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast94
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast76
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast256
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast74
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast116
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast140
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast88
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast224
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast52
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast60
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast76
-rw-r--r--crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast90
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0000_empty.rast2
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast78
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast44
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rast4
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast368
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast80
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast186
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0009_use_item.rast42
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast84
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast116
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0012_visibility.rast214
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast114
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast190
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast130
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast186
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast58
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast514
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0019_enums.rast310
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast536
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast118
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rast42
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0023_static_items.rast82
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0024_const_item.rast118
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast66
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast64
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast372
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast304
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast128
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0030_traits.rast122
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0031_extern.rast1946
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0032_where_for.rast182
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0033_label_break.rast440
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast84
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast4658
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast186
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0037_mod.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast86
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast32
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast44
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast100
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast252
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast220
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast152
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast362
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast56
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast646
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast402
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0049_async_block.rast72
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast184
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast1038
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast162
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast78
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast252
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast100
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast132
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast118
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast194
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast202
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0060_as_range.rast112
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast54
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast352
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast396
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast266
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast332
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast34
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast122
-rw-r--r--crates/ra_text_edit/Cargo.toml3
-rw-r--r--crates/ra_text_edit/src/lib.rs10
-rw-r--r--crates/ra_text_edit/src/text_edit.rs25
-rw-r--r--crates/rust-analyzer/src/cli/analysis_stats.rs2
-rw-r--r--crates/rust-analyzer/src/conv.rs18
-rw-r--r--crates/rust-analyzer/src/main_loop.rs2
-rw-r--r--crates/rust-analyzer/src/main_loop/handlers.rs22
-rw-r--r--crates/rust-analyzer/src/req.rs3
-rw-r--r--crates/test_utils/Cargo.toml2
-rw-r--r--crates/test_utils/src/lib.rs26
-rw-r--r--docs/dev/syntax.md154
461 files changed, 27116 insertions, 27153 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d966ebe61..20e6cd540 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1180,7 +1180,7 @@ dependencies = [
1180name = "ra_text_edit" 1180name = "ra_text_edit"
1181version = "0.1.0" 1181version = "0.1.0"
1182dependencies = [ 1182dependencies = [
1183 "text_unit", 1183 "text-size",
1184] 1184]
1185 1185
1186[[package]] 1186[[package]]
@@ -1322,13 +1322,13 @@ dependencies = [
1322 1322
1323[[package]] 1323[[package]]
1324name = "rowan" 1324name = "rowan"
1325version = "0.9.1" 1325version = "0.10.0"
1326source = "registry+https://github.com/rust-lang/crates.io-index" 1326source = "registry+https://github.com/rust-lang/crates.io-index"
1327checksum = "1ea7cadf87a9d8432e85cb4eb86bd2e765ace60c24ef86e79084dcae5d1c5a19" 1327checksum = "1e081ed6eacce09e243b619ab90f069c27b0cff8a6d0eb8ad2ec935b65853798"
1328dependencies = [ 1328dependencies = [
1329 "rustc-hash", 1329 "rustc-hash",
1330 "smol_str", 1330 "smol_str",
1331 "text_unit", 1331 "text-size",
1332 "thin-dst", 1332 "thin-dst",
1333] 1333]
1334 1334
@@ -1620,14 +1620,14 @@ version = "0.1.0"
1620dependencies = [ 1620dependencies = [
1621 "difference", 1621 "difference",
1622 "serde_json", 1622 "serde_json",
1623 "text_unit", 1623 "text-size",
1624] 1624]
1625 1625
1626[[package]] 1626[[package]]
1627name = "text_unit" 1627name = "text-size"
1628version = "0.1.10" 1628version = "1.0.0"
1629source = "registry+https://github.com/rust-lang/crates.io-index" 1629source = "registry+https://github.com/rust-lang/crates.io-index"
1630checksum = "20431e104bfecc1a40872578dbc390e10290a0e9c35fffe3ce6f73c15a9dbfc2" 1630checksum = "f03e7efdedc3bc78cb2337f1e2785c39e45f5ef762d9e4ebb137fff7380a6d8a"
1631 1631
1632[[package]] 1632[[package]]
1633name = "thin-dst" 1633name = "thin-dst"
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index 279163257..2fe7c3de3 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -5,7 +5,7 @@ use ra_fmt::{leading_indent, reindent};
5use ra_ide_db::RootDatabase; 5use ra_ide_db::RootDatabase;
6use ra_syntax::{ 6use ra_syntax::{
7 algo::{self, find_covering_element, find_node_at_offset}, 7 algo::{self, find_covering_element, find_node_at_offset},
8 AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextUnit, 8 AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize,
9 TokenAtOffset, 9 TokenAtOffset,
10}; 10};
11use ra_text_edit::TextEditBuilder; 11use ra_text_edit::TextEditBuilder;
@@ -178,7 +178,7 @@ impl<'a> AssistGroup<'a> {
178#[derive(Default)] 178#[derive(Default)]
179pub(crate) struct ActionBuilder { 179pub(crate) struct ActionBuilder {
180 edit: TextEditBuilder, 180 edit: TextEditBuilder,
181 cursor_position: Option<TextUnit>, 181 cursor_position: Option<TextSize>,
182 target: Option<TextRange>, 182 target: Option<TextRange>,
183 file: AssistFile, 183 file: AssistFile,
184} 184}
@@ -211,12 +211,12 @@ impl ActionBuilder {
211 } 211 }
212 212
213 /// Append specified `text` at the given `offset` 213 /// Append specified `text` at the given `offset`
214 pub(crate) fn insert(&mut self, offset: TextUnit, text: impl Into<String>) { 214 pub(crate) fn insert(&mut self, offset: TextSize, text: impl Into<String>) {
215 self.edit.insert(offset, text.into()) 215 self.edit.insert(offset, text.into())
216 } 216 }
217 217
218 /// Specify desired position of the cursor after the assist is applied. 218 /// Specify desired position of the cursor after the assist is applied.
219 pub(crate) fn set_cursor(&mut self, offset: TextUnit) { 219 pub(crate) fn set_cursor(&mut self, offset: TextSize) {
220 self.cursor_position = Some(offset) 220 self.cursor_position = Some(offset)
221 } 221 }
222 222
diff --git a/crates/ra_assists/src/handlers/add_custom_impl.rs b/crates/ra_assists/src/handlers/add_custom_impl.rs
index 15f9b216b..4ea26a550 100644
--- a/crates/ra_assists/src/handlers/add_custom_impl.rs
+++ b/crates/ra_assists/src/handlers/add_custom_impl.rs
@@ -2,7 +2,7 @@ use ra_syntax::{
2 ast::{self, AstNode}, 2 ast::{self, AstNode},
3 Direction, SmolStr, 3 Direction, SmolStr,
4 SyntaxKind::{IDENT, WHITESPACE}, 4 SyntaxKind::{IDENT, WHITESPACE},
5 TextRange, TextUnit, 5 TextRange, TextSize,
6}; 6};
7use stdx::SepBy; 7use stdx::SepBy;
8 8
@@ -60,7 +60,6 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
60 .collect::<Vec<SmolStr>>(); 60 .collect::<Vec<SmolStr>>();
61 let has_more_derives = !new_attr_input.is_empty(); 61 let has_more_derives = !new_attr_input.is_empty();
62 let new_attr_input = new_attr_input.iter().sep_by(", ").surround_with("(", ")").to_string(); 62 let new_attr_input = new_attr_input.iter().sep_by(", ").surround_with("(", ")").to_string();
63 let new_attr_input_len = new_attr_input.len();
64 63
65 let mut buf = String::new(); 64 let mut buf = String::new();
66 buf.push_str("\n\nimpl "); 65 buf.push_str("\n\nimpl ");
@@ -70,8 +69,9 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
70 buf.push_str(" {\n"); 69 buf.push_str(" {\n");
71 70
72 let cursor_delta = if has_more_derives { 71 let cursor_delta = if has_more_derives {
72 let delta = input.syntax().text_range().len() - TextSize::of(&new_attr_input);
73 edit.replace(input.syntax().text_range(), new_attr_input); 73 edit.replace(input.syntax().text_range(), new_attr_input);
74 input.syntax().text_range().len() - TextUnit::from_usize(new_attr_input_len) 74 delta
75 } else { 75 } else {
76 let attr_range = attr.syntax().text_range(); 76 let attr_range = attr.syntax().text_range();
77 edit.delete(attr_range); 77 edit.delete(attr_range);
@@ -81,13 +81,13 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
81 .next_sibling_or_token() 81 .next_sibling_or_token()
82 .filter(|t| t.kind() == WHITESPACE) 82 .filter(|t| t.kind() == WHITESPACE)
83 .map(|t| t.text_range()) 83 .map(|t| t.text_range())
84 .unwrap_or_else(|| TextRange::from_to(TextUnit::from(0), TextUnit::from(0))); 84 .unwrap_or_else(|| TextRange::new(TextSize::from(0), TextSize::from(0)));
85 edit.delete(line_break_range); 85 edit.delete(line_break_range);
86 86
87 attr_range.len() + line_break_range.len() 87 attr_range.len() + line_break_range.len()
88 }; 88 };
89 89
90 edit.set_cursor(start_offset + TextUnit::of_str(&buf) - cursor_delta); 90 edit.set_cursor(start_offset + TextSize::of(&buf) - cursor_delta);
91 buf.push_str("\n}"); 91 buf.push_str("\n}");
92 edit.insert(start_offset, buf); 92 edit.insert(start_offset, buf);
93 }) 93 })
diff --git a/crates/ra_assists/src/handlers/add_derive.rs b/crates/ra_assists/src/handlers/add_derive.rs
index b0d1a0a80..6254eb7c4 100644
--- a/crates/ra_assists/src/handlers/add_derive.rs
+++ b/crates/ra_assists/src/handlers/add_derive.rs
@@ -1,7 +1,7 @@
1use ra_syntax::{ 1use ra_syntax::{
2 ast::{self, AstNode, AttrsOwner}, 2 ast::{self, AstNode, AttrsOwner},
3 SyntaxKind::{COMMENT, WHITESPACE}, 3 SyntaxKind::{COMMENT, WHITESPACE},
4 TextUnit, 4 TextSize,
5}; 5};
6 6
7use crate::{Assist, AssistCtx, AssistId}; 7use crate::{Assist, AssistCtx, AssistId};
@@ -37,9 +37,9 @@ pub(crate) fn add_derive(ctx: AssistCtx) -> Option<Assist> {
37 let offset = match derive_attr { 37 let offset = match derive_attr {
38 None => { 38 None => {
39 edit.insert(node_start, "#[derive()]\n"); 39 edit.insert(node_start, "#[derive()]\n");
40 node_start + TextUnit::of_str("#[derive(") 40 node_start + TextSize::of("#[derive(")
41 } 41 }
42 Some(tt) => tt.syntax().text_range().end() - TextUnit::of_char(')'), 42 Some(tt) => tt.syntax().text_range().end() - TextSize::of(')'),
43 }; 43 };
44 edit.target(nominal.syntax().text_range()); 44 edit.target(nominal.syntax().text_range());
45 edit.set_cursor(offset) 45 edit.set_cursor(offset)
@@ -47,7 +47,7 @@ pub(crate) fn add_derive(ctx: AssistCtx) -> Option<Assist> {
47} 47}
48 48
49// Insert `derive` after doc comments. 49// Insert `derive` after doc comments.
50fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextUnit> { 50fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextSize> {
51 let non_ws_child = nominal 51 let non_ws_child = nominal
52 .syntax() 52 .syntax()
53 .children_with_tokens() 53 .children_with_tokens()
diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/ra_assists/src/handlers/add_explicit_type.rs
index 6c56d93d8..bc313782b 100644
--- a/crates/ra_assists/src/handlers/add_explicit_type.rs
+++ b/crates/ra_assists/src/handlers/add_explicit_type.rs
@@ -37,8 +37,8 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx) -> Option<Assist> {
37 let stmt_range = stmt.syntax().text_range(); 37 let stmt_range = stmt.syntax().text_range();
38 let eq_range = stmt.eq_token()?.text_range(); 38 let eq_range = stmt.eq_token()?.text_range();
39 // Assist should only be applicable if cursor is between 'let' and '=' 39 // Assist should only be applicable if cursor is between 'let' and '='
40 let let_range = TextRange::from_to(stmt_range.start(), eq_range.start()); 40 let let_range = TextRange::new(stmt_range.start(), eq_range.start());
41 let cursor_in_range = ctx.frange.range.is_subrange(&let_range); 41 let cursor_in_range = let_range.contains_range(ctx.frange.range);
42 if !cursor_in_range { 42 if !cursor_in_range {
43 return None; 43 return None;
44 } 44 }
diff --git a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs b/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
index 0621487e8..03806724a 100644
--- a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
+++ b/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
@@ -1,6 +1,6 @@
1use ra_syntax::{ 1use ra_syntax::{
2 ast::{self, AstNode, NameOwner}, 2 ast::{self, AstNode, NameOwner},
3 TextUnit, 3 TextSize,
4}; 4};
5use stdx::format_to; 5use stdx::format_to;
6 6
@@ -65,7 +65,7 @@ impl From<{0}> for {1} {{
65 variant_name 65 variant_name
66 ); 66 );
67 edit.insert(start_offset, buf); 67 edit.insert(start_offset, buf);
68 edit.set_cursor(start_offset + TextUnit::of_str("\n\n")); 68 edit.set_cursor(start_offset + TextSize::of("\n\n"));
69 }, 69 },
70 ) 70 )
71} 71}
diff --git a/crates/ra_assists/src/handlers/add_function.rs b/crates/ra_assists/src/handlers/add_function.rs
index f185cffdb..6c7456579 100644
--- a/crates/ra_assists/src/handlers/add_function.rs
+++ b/crates/ra_assists/src/handlers/add_function.rs
@@ -1,6 +1,6 @@
1use ra_syntax::{ 1use ra_syntax::{
2 ast::{self, AstNode}, 2 ast::{self, AstNode},
3 SyntaxKind, SyntaxNode, TextUnit, 3 SyntaxKind, SyntaxNode, TextSize,
4}; 4};
5 5
6use crate::{Assist, AssistCtx, AssistFile, AssistId}; 6use crate::{Assist, AssistCtx, AssistFile, AssistId};
@@ -69,8 +69,8 @@ pub(crate) fn add_function(ctx: AssistCtx) -> Option<Assist> {
69} 69}
70 70
71struct FunctionTemplate { 71struct FunctionTemplate {
72 insert_offset: TextUnit, 72 insert_offset: TextSize,
73 cursor_offset: TextUnit, 73 cursor_offset: TextSize,
74 fn_def: ast::SourceFile, 74 fn_def: ast::SourceFile,
75 file: AssistFile, 75 file: AssistFile,
76} 76}
@@ -129,7 +129,7 @@ impl FunctionBuilder {
129 let fn_def = indent_once.increase_indent(fn_def); 129 let fn_def = indent_once.increase_indent(fn_def);
130 let fn_def = ast::make::add_trailing_newlines(1, fn_def); 130 let fn_def = ast::make::add_trailing_newlines(1, fn_def);
131 let fn_def = indent.increase_indent(fn_def); 131 let fn_def = indent.increase_indent(fn_def);
132 (fn_def, it.syntax().text_range().start() + TextUnit::from_usize(1)) 132 (fn_def, it.syntax().text_range().start() + TextSize::of('{'))
133 } 133 }
134 }; 134 };
135 135
diff --git a/crates/ra_assists/src/handlers/add_impl.rs b/crates/ra_assists/src/handlers/add_impl.rs
index 6622eadb2..d26f8b93d 100644
--- a/crates/ra_assists/src/handlers/add_impl.rs
+++ b/crates/ra_assists/src/handlers/add_impl.rs
@@ -1,6 +1,6 @@
1use ra_syntax::{ 1use ra_syntax::{
2 ast::{self, AstNode, NameOwner, TypeParamsOwner}, 2 ast::{self, AstNode, NameOwner, TypeParamsOwner},
3 TextUnit, 3 TextSize,
4}; 4};
5use stdx::{format_to, SepBy}; 5use stdx::{format_to, SepBy};
6 6
@@ -51,7 +51,7 @@ pub(crate) fn add_impl(ctx: AssistCtx) -> Option<Assist> {
51 format_to!(buf, "<{}>", generic_params) 51 format_to!(buf, "<{}>", generic_params)
52 } 52 }
53 buf.push_str(" {\n"); 53 buf.push_str(" {\n");
54 edit.set_cursor(start_offset + TextUnit::of_str(&buf)); 54 edit.set_cursor(start_offset + TextSize::of(&buf));
55 buf.push_str("\n}"); 55 buf.push_str("\n}");
56 edit.insert(start_offset, buf); 56 edit.insert(start_offset, buf);
57 }) 57 })
diff --git a/crates/ra_assists/src/handlers/add_new.rs b/crates/ra_assists/src/handlers/add_new.rs
index 240b19fa3..0f9174a29 100644
--- a/crates/ra_assists/src/handlers/add_new.rs
+++ b/crates/ra_assists/src/handlers/add_new.rs
@@ -3,7 +3,7 @@ use ra_syntax::{
3 ast::{ 3 ast::{
4 self, AstNode, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner, VisibilityOwner, 4 self, AstNode, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner, VisibilityOwner,
5 }, 5 },
6 TextUnit, T, 6 TextSize, T,
7}; 7};
8use stdx::{format_to, SepBy}; 8use stdx::{format_to, SepBy};
9 9
@@ -77,16 +77,16 @@ pub(crate) fn add_new(ctx: AssistCtx) -> Option<Assist> {
77 .text_range() 77 .text_range()
78 .end(); 78 .end();
79 79
80 Some((start, TextUnit::from_usize(1))) 80 Some((start, TextSize::of("\n")))
81 }) 81 })
82 .unwrap_or_else(|| { 82 .unwrap_or_else(|| {
83 buf = generate_impl_text(&strukt, &buf); 83 buf = generate_impl_text(&strukt, &buf);
84 let start = strukt.syntax().text_range().end(); 84 let start = strukt.syntax().text_range().end();
85 85
86 (start, TextUnit::from_usize(3)) 86 (start, TextSize::of("\n}\n"))
87 }); 87 });
88 88
89 edit.set_cursor(start_offset + TextUnit::of_str(&buf) - end_offset); 89 edit.set_cursor(start_offset + TextSize::of(&buf) - end_offset);
90 edit.insert(start_offset, buf); 90 edit.insert(start_offset, buf);
91 }) 91 })
92} 92}
diff --git a/crates/ra_assists/src/handlers/apply_demorgan.rs b/crates/ra_assists/src/handlers/apply_demorgan.rs
index 239807e24..260b9e073 100644
--- a/crates/ra_assists/src/handlers/apply_demorgan.rs
+++ b/crates/ra_assists/src/handlers/apply_demorgan.rs
@@ -26,7 +26,7 @@ pub(crate) fn apply_demorgan(ctx: AssistCtx) -> Option<Assist> {
26 let op = expr.op_kind()?; 26 let op = expr.op_kind()?;
27 let op_range = expr.op_token()?.text_range(); 27 let op_range = expr.op_token()?.text_range();
28 let opposite_op = opposite_logic_op(op)?; 28 let opposite_op = opposite_logic_op(op)?;
29 let cursor_in_range = ctx.frange.range.is_subrange(&op_range); 29 let cursor_in_range = op_range.contains_range(ctx.frange.range);
30 if !cursor_in_range { 30 if !cursor_in_range {
31 return None; 31 return None;
32 } 32 }
diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/ra_assists/src/handlers/change_visibility.rs
index cd6d1ee6c..44f6a1dae 100644
--- a/crates/ra_assists/src/handlers/change_visibility.rs
+++ b/crates/ra_assists/src/handlers/change_visibility.rs
@@ -5,7 +5,7 @@ use ra_syntax::{
5 ATTR, COMMENT, CONST_DEF, ENUM_DEF, FN_DEF, MODULE, STRUCT_DEF, TRAIT_DEF, VISIBILITY, 5 ATTR, COMMENT, CONST_DEF, ENUM_DEF, FN_DEF, MODULE, STRUCT_DEF, TRAIT_DEF, VISIBILITY,
6 WHITESPACE, 6 WHITESPACE,
7 }, 7 },
8 SyntaxNode, TextUnit, T, 8 SyntaxNode, TextSize, T,
9}; 9};
10 10
11use crate::{Assist, AssistCtx, AssistId}; 11use crate::{Assist, AssistCtx, AssistId};
@@ -67,7 +67,7 @@ fn add_vis(ctx: AssistCtx) -> Option<Assist> {
67 }) 67 })
68} 68}
69 69
70fn vis_offset(node: &SyntaxNode) -> TextUnit { 70fn vis_offset(node: &SyntaxNode) -> TextSize {
71 node.children_with_tokens() 71 node.children_with_tokens()
72 .skip_while(|it| match it.kind() { 72 .skip_while(|it| match it.kind() {
73 WHITESPACE | COMMENT | ATTR => true, 73 WHITESPACE | COMMENT | ATTR => true,
diff --git a/crates/ra_assists/src/handlers/flip_binexpr.rs b/crates/ra_assists/src/handlers/flip_binexpr.rs
index bfcc09e90..8030efb35 100644
--- a/crates/ra_assists/src/handlers/flip_binexpr.rs
+++ b/crates/ra_assists/src/handlers/flip_binexpr.rs
@@ -23,7 +23,7 @@ pub(crate) fn flip_binexpr(ctx: AssistCtx) -> Option<Assist> {
23 let rhs = expr.rhs()?.syntax().clone(); 23 let rhs = expr.rhs()?.syntax().clone();
24 let op_range = expr.op_token()?.text_range(); 24 let op_range = expr.op_token()?.text_range();
25 // The assist should be applied only if the cursor is on the operator 25 // The assist should be applied only if the cursor is on the operator
26 let cursor_in_range = ctx.frange.range.is_subrange(&op_range); 26 let cursor_in_range = op_range.contains_range(ctx.frange.range);
27 if !cursor_in_range { 27 if !cursor_in_range {
28 return None; 28 return None;
29 } 29 }
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index c4fb425b0..f5702f6e0 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -52,7 +52,7 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
52 .next_sibling_or_token() 52 .next_sibling_or_token()
53 .and_then(|it| ast::Whitespace::cast(it.as_token()?.clone())) 53 .and_then(|it| ast::Whitespace::cast(it.as_token()?.clone()))
54 { 54 {
55 TextRange::from_to( 55 TextRange::new(
56 let_stmt.syntax().text_range().start(), 56 let_stmt.syntax().text_range().start(),
57 whitespace.syntax().text_range().end(), 57 whitespace.syntax().text_range().end(),
58 ) 58 )
diff --git a/crates/ra_assists/src/handlers/introduce_variable.rs b/crates/ra_assists/src/handlers/introduce_variable.rs
index 8c09e6bcd..eda9ac296 100644
--- a/crates/ra_assists/src/handlers/introduce_variable.rs
+++ b/crates/ra_assists/src/handlers/introduce_variable.rs
@@ -4,7 +4,7 @@ use ra_syntax::{
4 BLOCK_EXPR, BREAK_EXPR, COMMENT, LAMBDA_EXPR, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR, 4 BLOCK_EXPR, BREAK_EXPR, COMMENT, LAMBDA_EXPR, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR,
5 WHITESPACE, 5 WHITESPACE,
6 }, 6 },
7 SyntaxNode, TextUnit, 7 SyntaxNode, TextSize,
8}; 8};
9use stdx::format_to; 9use stdx::format_to;
10use test_utils::tested_by; 10use test_utils::tested_by;
@@ -47,10 +47,10 @@ pub(crate) fn introduce_variable(ctx: AssistCtx) -> Option<Assist> {
47 47
48 let cursor_offset = if wrap_in_block { 48 let cursor_offset = if wrap_in_block {
49 buf.push_str("{ let var_name = "); 49 buf.push_str("{ let var_name = ");
50 TextUnit::of_str("{ let ") 50 TextSize::of("{ let ")
51 } else { 51 } else {
52 buf.push_str("let var_name = "); 52 buf.push_str("let var_name = ");
53 TextUnit::of_str("let ") 53 TextSize::of("let ")
54 }; 54 };
55 format_to!(buf, "{}", expr.syntax()); 55 format_to!(buf, "{}", expr.syntax());
56 let full_stmt = ast::ExprStmt::cast(anchor_stmt.clone()); 56 let full_stmt = ast::ExprStmt::cast(anchor_stmt.clone());
diff --git a/crates/ra_assists/src/handlers/invert_if.rs b/crates/ra_assists/src/handlers/invert_if.rs
index 4c5716868..682e08512 100644
--- a/crates/ra_assists/src/handlers/invert_if.rs
+++ b/crates/ra_assists/src/handlers/invert_if.rs
@@ -28,7 +28,7 @@ pub(crate) fn invert_if(ctx: AssistCtx) -> Option<Assist> {
28 let if_keyword = ctx.find_token_at_offset(T![if])?; 28 let if_keyword = ctx.find_token_at_offset(T![if])?;
29 let expr = ast::IfExpr::cast(if_keyword.parent())?; 29 let expr = ast::IfExpr::cast(if_keyword.parent())?;
30 let if_range = if_keyword.text_range(); 30 let if_range = if_keyword.text_range();
31 let cursor_in_range = ctx.frange.range.is_subrange(&if_range); 31 let cursor_in_range = if_range.contains_range(ctx.frange.range);
32 if !cursor_in_range { 32 if !cursor_in_range {
33 return None; 33 return None;
34 } 34 }
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs
index eb967ab92..5a77d3dbc 100644
--- a/crates/ra_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ra_assists/src/handlers/merge_match_arms.rs
@@ -3,7 +3,7 @@ use std::iter::successors;
3use ra_syntax::{ 3use ra_syntax::{
4 algo::neighbor, 4 algo::neighbor,
5 ast::{self, AstNode}, 5 ast::{self, AstNode},
6 Direction, TextUnit, 6 Direction, TextSize,
7}; 7};
8 8
9use crate::{Assist, AssistCtx, AssistId, TextRange}; 9use crate::{Assist, AssistCtx, AssistId, TextRange};
@@ -42,8 +42,8 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx) -> Option<Assist> {
42 let current_text_range = current_arm.syntax().text_range(); 42 let current_text_range = current_arm.syntax().text_range();
43 43
44 enum CursorPos { 44 enum CursorPos {
45 InExpr(TextUnit), 45 InExpr(TextSize),
46 InPat(TextUnit), 46 InPat(TextSize),
47 } 47 }
48 let cursor_pos = ctx.frange.range.start(); 48 let cursor_pos = ctx.frange.range.start();
49 let cursor_pos = if current_expr.syntax().text_range().contains(cursor_pos) { 49 let cursor_pos = if current_expr.syntax().text_range().contains(cursor_pos) {
@@ -89,10 +89,10 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx) -> Option<Assist> {
89 89
90 edit.target(current_text_range); 90 edit.target(current_text_range);
91 edit.set_cursor(match cursor_pos { 91 edit.set_cursor(match cursor_pos {
92 CursorPos::InExpr(back_offset) => start + TextUnit::from_usize(arm.len()) - back_offset, 92 CursorPos::InExpr(back_offset) => start + TextSize::of(&arm) - back_offset,
93 CursorPos::InPat(offset) => offset, 93 CursorPos::InPat(offset) => offset,
94 }); 94 });
95 edit.replace(TextRange::from_to(start, end), arm); 95 edit.replace(TextRange::new(start, end), arm);
96 }) 96 })
97} 97}
98 98
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index 1cc498638..d5ccdd91c 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/ra_assists/src/handlers/move_guard.rs
@@ -1,7 +1,7 @@
1use ra_syntax::{ 1use ra_syntax::{
2 ast, 2 ast,
3 ast::{AstNode, AstToken, IfExpr, MatchArm}, 3 ast::{AstNode, AstToken, IfExpr, MatchArm},
4 TextUnit, 4 TextSize,
5}; 5};
6 6
7use crate::{Assist, AssistCtx, AssistId}; 7use crate::{Assist, AssistCtx, AssistId};
@@ -49,16 +49,16 @@ pub(crate) fn move_guard_to_arm_body(ctx: AssistCtx) -> Option<Assist> {
49 edit.delete(ele); 49 edit.delete(ele);
50 ele.len() 50 ele.len()
51 } else { 51 } else {
52 TextUnit::from(0) 52 TextSize::from(0)
53 } 53 }
54 } 54 }
55 _ => TextUnit::from(0), 55 _ => TextSize::from(0),
56 }; 56 };
57 57
58 edit.delete(guard.syntax().text_range()); 58 edit.delete(guard.syntax().text_range());
59 edit.replace_node_and_indent(arm_expr.syntax(), buf); 59 edit.replace_node_and_indent(arm_expr.syntax(), buf);
60 edit.set_cursor( 60 edit.set_cursor(
61 arm_expr.syntax().text_range().start() + TextUnit::from(3) - offseting_amount, 61 arm_expr.syntax().text_range().start() + TextSize::from(3) - offseting_amount,
62 ); 62 );
63 }) 63 })
64} 64}
@@ -123,7 +123,7 @@ pub(crate) fn move_arm_cond_to_match_guard(ctx: AssistCtx) -> Option<Assist> {
123 } 123 }
124 124
125 edit.insert(match_pat.syntax().text_range().end(), buf); 125 edit.insert(match_pat.syntax().text_range().end(), buf);
126 edit.set_cursor(match_pat.syntax().text_range().end() + TextUnit::from(1)); 126 edit.set_cursor(match_pat.syntax().text_range().end() + TextSize::from(1));
127 }, 127 },
128 ) 128 )
129} 129}
diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/ra_assists/src/handlers/raw_string.rs
index 7e4b83f13..567400b9c 100644
--- a/crates/ra_assists/src/handlers/raw_string.rs
+++ b/crates/ra_assists/src/handlers/raw_string.rs
@@ -2,7 +2,7 @@ use ra_syntax::{
2 ast::{self, HasStringValue}, 2 ast::{self, HasStringValue},
3 AstToken, 3 AstToken,
4 SyntaxKind::{RAW_STRING, STRING}, 4 SyntaxKind::{RAW_STRING, STRING},
5 TextUnit, 5 TextSize,
6}; 6};
7 7
8use crate::{Assist, AssistCtx, AssistId}; 8use crate::{Assist, AssistCtx, AssistId};
@@ -81,7 +81,7 @@ pub(crate) fn add_hash(ctx: AssistCtx) -> Option<Assist> {
81 let token = ctx.find_token_at_offset(RAW_STRING)?; 81 let token = ctx.find_token_at_offset(RAW_STRING)?;
82 ctx.add_assist(AssistId("add_hash"), "Add # to raw string", |edit| { 82 ctx.add_assist(AssistId("add_hash"), "Add # to raw string", |edit| {
83 edit.target(token.text_range()); 83 edit.target(token.text_range());
84 edit.insert(token.text_range().start() + TextUnit::of_char('r'), "#"); 84 edit.insert(token.text_range().start() + TextSize::of('r'), "#");
85 edit.insert(token.text_range().end(), "#"); 85 edit.insert(token.text_range().end(), "#");
86 }) 86 })
87} 87}
diff --git a/crates/ra_assists/src/handlers/remove_dbg.rs b/crates/ra_assists/src/handlers/remove_dbg.rs
index 5085649b4..4e5eb4350 100644
--- a/crates/ra_assists/src/handlers/remove_dbg.rs
+++ b/crates/ra_assists/src/handlers/remove_dbg.rs
@@ -1,6 +1,6 @@
1use ra_syntax::{ 1use ra_syntax::{
2 ast::{self, AstNode}, 2 ast::{self, AstNode},
3 TextUnit, T, 3 TextSize, T,
4}; 4};
5 5
6use crate::{Assist, AssistCtx, AssistId}; 6use crate::{Assist, AssistCtx, AssistId};
@@ -38,9 +38,9 @@ pub(crate) fn remove_dbg(ctx: AssistCtx) -> Option<Assist> {
38 let offset_start = file_range 38 let offset_start = file_range
39 .start() 39 .start()
40 .checked_sub(macro_range.start()) 40 .checked_sub(macro_range.start())
41 .unwrap_or_else(|| TextUnit::from(0)); 41 .unwrap_or_else(|| TextSize::from(0));
42 42
43 let dbg_size = TextUnit::of_str("dbg!("); 43 let dbg_size = TextSize::of("dbg!(");
44 44
45 if offset_start > dbg_size { 45 if offset_start > dbg_size {
46 file_range.start() - dbg_size 46 file_range.start() - dbg_size
@@ -53,7 +53,7 @@ pub(crate) fn remove_dbg(ctx: AssistCtx) -> Option<Assist> {
53 let macro_args = macro_call.token_tree()?.syntax().clone(); 53 let macro_args = macro_call.token_tree()?.syntax().clone();
54 54
55 let text = macro_args.text(); 55 let text = macro_args.text();
56 let without_parens = TextUnit::of_char('(')..text.len() - TextUnit::of_char(')'); 56 let without_parens = TextSize::of('(')..text.len() - TextSize::of(')');
57 text.slice(without_parens).to_string() 57 text.slice(without_parens).to_string()
58 }; 58 };
59 59
diff --git a/crates/ra_assists/src/handlers/remove_mut.rs b/crates/ra_assists/src/handlers/remove_mut.rs
index 6884830eb..e598023b2 100644
--- a/crates/ra_assists/src/handlers/remove_mut.rs
+++ b/crates/ra_assists/src/handlers/remove_mut.rs
@@ -27,6 +27,6 @@ pub(crate) fn remove_mut(ctx: AssistCtx) -> Option<Assist> {
27 27
28 ctx.add_assist(AssistId("remove_mut"), "Remove `mut` keyword", |edit| { 28 ctx.add_assist(AssistId("remove_mut"), "Remove `mut` keyword", |edit| {
29 edit.set_cursor(delete_from); 29 edit.set_cursor(delete_from);
30 edit.delete(TextRange::from_to(delete_from, delete_to)); 30 edit.delete(TextRange::new(delete_from, delete_to));
31 }) 31 })
32} 32}
diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
index 94f5d6c50..2f02df303 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -43,7 +43,7 @@ pub(crate) fn replace_qualified_name_with_use(ctx: AssistCtx) -> Option<Assist>
43 if let Some(last) = path.segment() { 43 if let Some(last) = path.segment() {
44 // Here we are assuming the assist will provide a correct use statement 44 // Here we are assuming the assist will provide a correct use statement
45 // so we can delete the path qualifier 45 // so we can delete the path qualifier
46 edit.delete(TextRange::from_to( 46 edit.delete(TextRange::new(
47 path.syntax().text_range().start(), 47 path.syntax().text_range().start(),
48 last.syntax().text_range().start(), 48 last.syntax().text_range().start(),
49 )); 49 ));
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index ccc95735f..64bd87afb 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -19,7 +19,7 @@ pub mod ast_transform;
19 19
20use ra_db::{FileId, FileRange}; 20use ra_db::{FileId, FileRange};
21use ra_ide_db::RootDatabase; 21use ra_ide_db::RootDatabase;
22use ra_syntax::{TextRange, TextUnit}; 22use ra_syntax::{TextRange, TextSize};
23use ra_text_edit::TextEdit; 23use ra_text_edit::TextEdit;
24 24
25pub(crate) use crate::assist_ctx::{Assist, AssistCtx, AssistHandler}; 25pub(crate) use crate::assist_ctx::{Assist, AssistCtx, AssistHandler};
@@ -51,7 +51,7 @@ impl AssistLabel {
51#[derive(Debug, Clone)] 51#[derive(Debug, Clone)]
52pub struct AssistAction { 52pub struct AssistAction {
53 pub edit: TextEdit, 53 pub edit: TextEdit,
54 pub cursor_position: Option<TextUnit>, 54 pub cursor_position: Option<TextSize>,
55 // FIXME: This belongs to `AssistLabel` 55 // FIXME: This belongs to `AssistLabel`
56 pub target: Option<TextRange>, 56 pub target: Option<TextRange>,
57 pub file: AssistFile, 57 pub file: AssistFile,
@@ -104,7 +104,7 @@ pub fn resolved_assists(db: &RootDatabase, range: FileRange) -> Vec<ResolvedAssi
104 .flat_map(|it| it.0) 104 .flat_map(|it| it.0)
105 .map(|it| it.into_resolved().unwrap()) 105 .map(|it| it.into_resolved().unwrap())
106 .collect::<Vec<_>>(); 106 .collect::<Vec<_>>();
107 a.sort_by_key(|it| it.action.target.map_or(TextUnit::from(!0u32), |it| it.len())); 107 a.sort_by_key(|it| it.action.target.map_or(TextSize::from(!0u32), |it| it.len()));
108 a 108 a
109} 109}
110 110
@@ -308,8 +308,7 @@ mod tests {
308 let before = "struct Foo { <|>bar: u32 }"; 308 let before = "struct Foo { <|>bar: u32 }";
309 let (before_cursor_pos, before) = extract_offset(before); 309 let (before_cursor_pos, before) = extract_offset(before);
310 let (db, file_id) = helpers::with_single_file(&before); 310 let (db, file_id) = helpers::with_single_file(&before);
311 let frange = 311 let frange = FileRange { file_id, range: TextRange::empty(before_cursor_pos) };
312 FileRange { file_id, range: TextRange::offset_len(before_cursor_pos, 0.into()) };
313 let assists = resolved_assists(&db, frange); 312 let assists = resolved_assists(&db, frange);
314 let mut assists = assists.iter(); 313 let mut assists = assists.iter();
315 314
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index a06f59c14..fd4280de2 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -6,7 +6,7 @@ pub mod fixture;
6use std::{panic, sync::Arc}; 6use std::{panic, sync::Arc};
7 7
8use ra_prof::profile; 8use ra_prof::profile;
9use ra_syntax::{ast, Parse, SourceFile, TextRange, TextUnit}; 9use ra_syntax::{ast, Parse, SourceFile, TextRange, TextSize};
10 10
11pub use crate::{ 11pub use crate::{
12 cancellation::Canceled, 12 cancellation::Canceled,
@@ -75,7 +75,7 @@ impl<T: salsa::Database> CheckCanceled for T {
75#[derive(Clone, Copy, Debug)] 75#[derive(Clone, Copy, Debug)]
76pub struct FilePosition { 76pub struct FilePosition {
77 pub file_id: FileId, 77 pub file_id: FileId,
78 pub offset: TextUnit, 78 pub offset: TextSize,
79} 79}
80 80
81#[derive(Clone, Copy, Debug)] 81#[derive(Clone, Copy, Debug)]
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 43f932e20..3f645a1dd 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -13,8 +13,8 @@ use hir_def::{
13 resolver::{HasResolver, Resolver}, 13 resolver::{HasResolver, Resolver},
14 type_ref::{Mutability, TypeRef}, 14 type_ref::{Mutability, TypeRef},
15 AdtId, AssocContainerId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, HasModule, 15 AdtId, AssocContainerId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, HasModule,
16 ImplId, LocalEnumVariantId, LocalModuleId, LocalStructFieldId, Lookup, ModuleId, StaticId, 16 ImplId, LocalEnumVariantId, LocalFieldId, LocalModuleId, Lookup, ModuleId, StaticId, StructId,
17 StructId, TraitId, TypeAliasId, TypeParamId, UnionId, 17 TraitId, TypeAliasId, TypeParamId, UnionId,
18}; 18};
19use hir_expand::{ 19use hir_expand::{
20 diagnostics::DiagnosticSink, 20 diagnostics::DiagnosticSink,
@@ -294,9 +294,9 @@ impl Module {
294} 294}
295 295
296#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 296#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
297pub struct StructField { 297pub struct Field {
298 pub(crate) parent: VariantDef, 298 pub(crate) parent: VariantDef,
299 pub(crate) id: LocalStructFieldId, 299 pub(crate) id: LocalFieldId,
300} 300}
301 301
302#[derive(Debug, PartialEq, Eq)] 302#[derive(Debug, PartialEq, Eq)]
@@ -305,7 +305,7 @@ pub enum FieldSource {
305 Pos(ast::TupleFieldDef), 305 Pos(ast::TupleFieldDef),
306} 306}
307 307
308impl StructField { 308impl Field {
309 pub fn name(&self, db: &dyn HirDatabase) -> Name { 309 pub fn name(&self, db: &dyn HirDatabase) -> Name {
310 self.parent.variant_data(db).fields()[self.id].name.clone() 310 self.parent.variant_data(db).fields()[self.id].name.clone()
311 } 311 }
@@ -331,7 +331,7 @@ impl StructField {
331 } 331 }
332} 332}
333 333
334impl HasVisibility for StructField { 334impl HasVisibility for Field {
335 fn visibility(&self, db: &dyn HirDatabase) -> Visibility { 335 fn visibility(&self, db: &dyn HirDatabase) -> Visibility {
336 let variant_data = self.parent.variant_data(db); 336 let variant_data = self.parent.variant_data(db);
337 let visibility = &variant_data.fields()[self.id].visibility; 337 let visibility = &variant_data.fields()[self.id].visibility;
@@ -358,12 +358,12 @@ impl Struct {
358 db.struct_data(self.id).name.clone() 358 db.struct_data(self.id).name.clone()
359 } 359 }
360 360
361 pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> { 361 pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
362 db.struct_data(self.id) 362 db.struct_data(self.id)
363 .variant_data 363 .variant_data
364 .fields() 364 .fields()
365 .iter() 365 .iter()
366 .map(|(id, _)| StructField { parent: self.into(), id }) 366 .map(|(id, _)| Field { parent: self.into(), id })
367 .collect() 367 .collect()
368 } 368 }
369 369
@@ -394,12 +394,12 @@ impl Union {
394 Type::from_def(db, self.id.lookup(db.upcast()).container.module(db.upcast()).krate, self.id) 394 Type::from_def(db, self.id.lookup(db.upcast()).container.module(db.upcast()).krate, self.id)
395 } 395 }
396 396
397 pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> { 397 pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
398 db.union_data(self.id) 398 db.union_data(self.id)
399 .variant_data 399 .variant_data
400 .fields() 400 .fields()
401 .iter() 401 .iter()
402 .map(|(id, _)| StructField { parent: self.into(), id }) 402 .map(|(id, _)| Field { parent: self.into(), id })
403 .collect() 403 .collect()
404 } 404 }
405 405
@@ -457,11 +457,11 @@ impl EnumVariant {
457 db.enum_data(self.parent.id).variants[self.id].name.clone() 457 db.enum_data(self.parent.id).variants[self.id].name.clone()
458 } 458 }
459 459
460 pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> { 460 pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
461 self.variant_data(db) 461 self.variant_data(db)
462 .fields() 462 .fields()
463 .iter() 463 .iter()
464 .map(|(id, _)| StructField { parent: self.into(), id }) 464 .map(|(id, _)| Field { parent: self.into(), id })
465 .collect() 465 .collect()
466 } 466 }
467 467
@@ -527,7 +527,7 @@ pub enum VariantDef {
527impl_froms!(VariantDef: Struct, Union, EnumVariant); 527impl_froms!(VariantDef: Struct, Union, EnumVariant);
528 528
529impl VariantDef { 529impl VariantDef {
530 pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> { 530 pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
531 match self { 531 match self {
532 VariantDef::Struct(it) => it.fields(db), 532 VariantDef::Struct(it) => it.fields(db),
533 VariantDef::Union(it) => it.fields(db), 533 VariantDef::Union(it) => it.fields(db),
@@ -1148,7 +1148,7 @@ impl Type {
1148 } 1148 }
1149 } 1149 }
1150 1150
1151 pub fn fields(&self, db: &dyn HirDatabase) -> Vec<(StructField, Type)> { 1151 pub fn fields(&self, db: &dyn HirDatabase) -> Vec<(Field, Type)> {
1152 if let Ty::Apply(a_ty) = &self.ty.value { 1152 if let Ty::Apply(a_ty) = &self.ty.value {
1153 if let TypeCtor::Adt(AdtId::StructId(s)) = a_ty.ctor { 1153 if let TypeCtor::Adt(AdtId::StructId(s)) = a_ty.ctor {
1154 let var_def = s.into(); 1154 let var_def = s.into();
@@ -1156,7 +1156,7 @@ impl Type {
1156 .field_types(var_def) 1156 .field_types(var_def)
1157 .iter() 1157 .iter()
1158 .map(|(local_id, ty)| { 1158 .map(|(local_id, ty)| {
1159 let def = StructField { parent: var_def.into(), id: local_id }; 1159 let def = Field { parent: var_def.into(), id: local_id };
1160 let ty = ty.clone().subst(&a_ty.parameters); 1160 let ty = ty.clone().subst(&a_ty.parameters);
1161 (def, self.derived(ty)) 1161 (def, self.derived(ty))
1162 }) 1162 })
@@ -1352,7 +1352,7 @@ impl ScopeDef {
1352#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] 1352#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
1353pub enum AttrDef { 1353pub enum AttrDef {
1354 Module(Module), 1354 Module(Module),
1355 StructField(StructField), 1355 Field(Field),
1356 Adt(Adt), 1356 Adt(Adt),
1357 Function(Function), 1357 Function(Function),
1358 EnumVariant(EnumVariant), 1358 EnumVariant(EnumVariant),
@@ -1365,7 +1365,7 @@ pub enum AttrDef {
1365 1365
1366impl_froms!( 1366impl_froms!(
1367 AttrDef: Module, 1367 AttrDef: Module,
1368 StructField, 1368 Field,
1369 Adt(Struct, Enum, Union), 1369 Adt(Struct, Enum, Union),
1370 EnumVariant, 1370 EnumVariant,
1371 Static, 1371 Static,
diff --git a/crates/ra_hir/src/from_id.rs b/crates/ra_hir/src/from_id.rs
index 62fb52e72..679ae8121 100644
--- a/crates/ra_hir/src/from_id.rs
+++ b/crates/ra_hir/src/from_id.rs
@@ -4,13 +4,13 @@
4//! are splitting the hir. 4//! are splitting the hir.
5 5
6use hir_def::{ 6use hir_def::{
7 expr::PatId, AdtId, AssocItemId, AttrDefId, DefWithBodyId, EnumVariantId, GenericDefId, 7 expr::PatId, AdtId, AssocItemId, AttrDefId, DefWithBodyId, EnumVariantId, FieldId,
8 ModuleDefId, StructFieldId, VariantId, 8 GenericDefId, ModuleDefId, VariantId,
9}; 9};
10 10
11use crate::{ 11use crate::{
12 code_model::ItemInNs, Adt, AssocItem, AttrDef, DefWithBody, EnumVariant, GenericDef, Local, 12 code_model::ItemInNs, Adt, AssocItem, AttrDef, DefWithBody, EnumVariant, Field, GenericDef,
13 MacroDef, ModuleDef, StructField, VariantDef, 13 Local, MacroDef, ModuleDef, VariantDef,
14}; 14};
15 15
16macro_rules! from_id { 16macro_rules! from_id {
@@ -184,15 +184,15 @@ impl From<VariantDef> for VariantId {
184 } 184 }
185} 185}
186 186
187impl From<StructField> for StructFieldId { 187impl From<Field> for FieldId {
188 fn from(def: StructField) -> Self { 188 fn from(def: Field) -> Self {
189 StructFieldId { parent: def.parent.into(), local_id: def.id } 189 FieldId { parent: def.parent.into(), local_id: def.id }
190 } 190 }
191} 191}
192 192
193impl From<StructFieldId> for StructField { 193impl From<FieldId> for Field {
194 fn from(def: StructFieldId) -> Self { 194 fn from(def: FieldId) -> Self {
195 StructField { parent: def.parent.into(), id: def.local_id } 195 Field { parent: def.parent.into(), id: def.local_id }
196 } 196 }
197} 197}
198 198
@@ -200,7 +200,7 @@ impl From<AttrDef> for AttrDefId {
200 fn from(def: AttrDef) -> Self { 200 fn from(def: AttrDef) -> Self {
201 match def { 201 match def {
202 AttrDef::Module(it) => AttrDefId::ModuleId(it.id), 202 AttrDef::Module(it) => AttrDefId::ModuleId(it.id),
203 AttrDef::StructField(it) => AttrDefId::StructFieldId(it.into()), 203 AttrDef::Field(it) => AttrDefId::FieldId(it.into()),
204 AttrDef::Adt(it) => AttrDefId::AdtId(it.into()), 204 AttrDef::Adt(it) => AttrDefId::AdtId(it.into()),
205 AttrDef::Function(it) => AttrDefId::FunctionId(it.id), 205 AttrDef::Function(it) => AttrDefId::FunctionId(it.id),
206 AttrDef::EnumVariant(it) => AttrDefId::EnumVariantId(it.into()), 206 AttrDef::EnumVariant(it) => AttrDefId::EnumVariantId(it.into()),
diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs
index 129764e0a..63b8fd369 100644
--- a/crates/ra_hir/src/has_source.rs
+++ b/crates/ra_hir/src/has_source.rs
@@ -9,8 +9,8 @@ use hir_def::{
9use ra_syntax::ast; 9use ra_syntax::ast;
10 10
11use crate::{ 11use crate::{
12 db::HirDatabase, Const, Enum, EnumVariant, FieldSource, Function, ImplDef, MacroDef, Module, 12 db::HirDatabase, Const, Enum, EnumVariant, Field, FieldSource, Function, ImplDef, MacroDef,
13 Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union, 13 Module, Static, Struct, Trait, TypeAlias, TypeParam, Union,
14}; 14};
15 15
16pub use hir_expand::InFile; 16pub use hir_expand::InFile;
@@ -37,7 +37,7 @@ impl Module {
37 } 37 }
38} 38}
39 39
40impl HasSource for StructField { 40impl HasSource for Field {
41 type Ast = FieldSource; 41 type Ast = FieldSource;
42 fn source(self, db: &dyn HirDatabase) -> InFile<FieldSource> { 42 fn source(self, db: &dyn HirDatabase) -> InFile<FieldSource> {
43 let var = VariantId::from(self.parent); 43 let var = VariantId::from(self.parent);
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 5af7e5d6d..312ef3814 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -52,9 +52,9 @@ mod has_source;
52pub use crate::{ 52pub use crate::{
53 code_model::{ 53 code_model::{
54 Adt, AsAssocItem, AssocItem, AssocItemContainer, AttrDef, Const, Crate, CrateDependency, 54 Adt, AsAssocItem, AssocItem, AssocItemContainer, AttrDef, Const, Crate, CrateDependency,
55 DefWithBody, Docs, Enum, EnumVariant, FieldSource, Function, GenericDef, HasAttrs, 55 DefWithBody, Docs, Enum, EnumVariant, Field, FieldSource, Function, GenericDef, HasAttrs,
56 HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, ScopeDef, Static, Struct, 56 HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, ScopeDef, Static, Struct,
57 StructField, Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility, 57 Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility,
58 }, 58 },
59 has_source::HasSource, 59 has_source::HasSource,
60 semantics::{original_range, PathResolution, Semantics, SemanticsScope}, 60 semantics::{original_range, PathResolution, Semantics, SemanticsScope},
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 5d6edc45c..86bfb416c 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -14,7 +14,7 @@ use ra_db::{FileId, FileRange};
14use ra_prof::profile; 14use ra_prof::profile;
15use ra_syntax::{ 15use ra_syntax::{
16 algo::{find_node_at_offset, skip_trivia_token}, 16 algo::{find_node_at_offset, skip_trivia_token},
17 ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextUnit, 17 ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
18}; 18};
19use rustc_hash::{FxHashMap, FxHashSet}; 19use rustc_hash::{FxHashMap, FxHashSet};
20 20
@@ -23,8 +23,8 @@ use crate::{
23 diagnostics::Diagnostic, 23 diagnostics::Diagnostic,
24 semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx}, 24 semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
25 source_analyzer::{resolve_hir_path, SourceAnalyzer}, 25 source_analyzer::{resolve_hir_path, SourceAnalyzer},
26 AssocItem, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef, Name, 26 AssocItem, Field, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef,
27 Origin, Path, ScopeDef, StructField, Trait, Type, TypeParam, 27 Name, Origin, Path, ScopeDef, Trait, Type, TypeParam,
28}; 28};
29 29
30#[derive(Debug, Clone, PartialEq, Eq)] 30#[derive(Debug, Clone, PartialEq, Eq)]
@@ -95,7 +95,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
95 let token = successors(Some(parent.with_value(token)), |token| { 95 let token = successors(Some(parent.with_value(token)), |token| {
96 let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?; 96 let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?;
97 let tt = macro_call.token_tree()?; 97 let tt = macro_call.token_tree()?;
98 if !token.value.text_range().is_subrange(&tt.syntax().text_range()) { 98 if !tt.syntax().text_range().contains_range(token.value.text_range()) {
99 return None; 99 return None;
100 } 100 }
101 let file_id = sa.expand(self.db, token.with_value(&macro_call))?; 101 let file_id = sa.expand(self.db, token.with_value(&macro_call))?;
@@ -114,7 +114,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
114 pub fn descend_node_at_offset<N: ast::AstNode>( 114 pub fn descend_node_at_offset<N: ast::AstNode>(
115 &self, 115 &self,
116 node: &SyntaxNode, 116 node: &SyntaxNode,
117 offset: TextUnit, 117 offset: TextSize,
118 ) -> Option<N> { 118 ) -> Option<N> {
119 // Handle macro token cases 119 // Handle macro token cases
120 node.token_at_offset(offset) 120 node.token_at_offset(offset)
@@ -142,7 +142,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
142 pub fn ancestors_at_offset_with_macros( 142 pub fn ancestors_at_offset_with_macros(
143 &self, 143 &self,
144 node: &SyntaxNode, 144 node: &SyntaxNode,
145 offset: TextUnit, 145 offset: TextSize,
146 ) -> impl Iterator<Item = SyntaxNode> + '_ { 146 ) -> impl Iterator<Item = SyntaxNode> + '_ {
147 node.token_at_offset(offset) 147 node.token_at_offset(offset)
148 .map(|token| self.ancestors_with_macros(token.parent())) 148 .map(|token| self.ancestors_with_macros(token.parent()))
@@ -154,7 +154,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
154 pub fn find_node_at_offset_with_macros<N: AstNode>( 154 pub fn find_node_at_offset_with_macros<N: AstNode>(
155 &self, 155 &self,
156 node: &SyntaxNode, 156 node: &SyntaxNode,
157 offset: TextUnit, 157 offset: TextSize,
158 ) -> Option<N> { 158 ) -> Option<N> {
159 self.ancestors_at_offset_with_macros(node, offset).find_map(N::cast) 159 self.ancestors_at_offset_with_macros(node, offset).find_map(N::cast)
160 } 160 }
@@ -164,7 +164,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
164 pub fn find_node_at_offset_with_descend<N: AstNode>( 164 pub fn find_node_at_offset_with_descend<N: AstNode>(
165 &self, 165 &self,
166 node: &SyntaxNode, 166 node: &SyntaxNode,
167 offset: TextUnit, 167 offset: TextSize,
168 ) -> Option<N> { 168 ) -> Option<N> {
169 if let Some(it) = find_node_at_offset(&node, offset) { 169 if let Some(it) = find_node_at_offset(&node, offset) {
170 return Some(it); 170 return Some(it);
@@ -184,18 +184,15 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
184 self.analyze(call.syntax()).resolve_method_call(self.db, call) 184 self.analyze(call.syntax()).resolve_method_call(self.db, call)
185 } 185 }
186 186
187 pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<StructField> { 187 pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<Field> {
188 self.analyze(field.syntax()).resolve_field(self.db, field) 188 self.analyze(field.syntax()).resolve_field(self.db, field)
189 } 189 }
190 190
191 pub fn resolve_record_field( 191 pub fn resolve_record_field(&self, field: &ast::RecordField) -> Option<(Field, Option<Local>)> {
192 &self,
193 field: &ast::RecordField,
194 ) -> Option<(StructField, Option<Local>)> {
195 self.analyze(field.syntax()).resolve_record_field(self.db, field) 192 self.analyze(field.syntax()).resolve_record_field(self.db, field)
196 } 193 }
197 194
198 pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<StructField> { 195 pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
199 self.analyze(field.syntax()).resolve_record_field_pat(self.db, field) 196 self.analyze(field.syntax()).resolve_record_field_pat(self.db, field)
200 } 197 }
201 198
@@ -216,19 +213,13 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
216 // FIXME: use this instead? 213 // FIXME: use this instead?
217 // pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>; 214 // pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>;
218 215
219 pub fn record_literal_missing_fields( 216 pub fn record_literal_missing_fields(&self, literal: &ast::RecordLit) -> Vec<(Field, Type)> {
220 &self,
221 literal: &ast::RecordLit,
222 ) -> Vec<(StructField, Type)> {
223 self.analyze(literal.syntax()) 217 self.analyze(literal.syntax())
224 .record_literal_missing_fields(self.db, literal) 218 .record_literal_missing_fields(self.db, literal)
225 .unwrap_or_default() 219 .unwrap_or_default()
226 } 220 }
227 221
228 pub fn record_pattern_missing_fields( 222 pub fn record_pattern_missing_fields(&self, pattern: &ast::RecordPat) -> Vec<(Field, Type)> {
229 &self,
230 pattern: &ast::RecordPat,
231 ) -> Vec<(StructField, Type)> {
232 self.analyze(pattern.syntax()) 223 self.analyze(pattern.syntax())
233 .record_pattern_missing_fields(self.db, pattern) 224 .record_pattern_missing_fields(self.db, pattern)
234 .unwrap_or_default() 225 .unwrap_or_default()
@@ -255,7 +246,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
255 SemanticsScope { db: self.db, resolver } 246 SemanticsScope { db: self.db, resolver }
256 } 247 }
257 248
258 pub fn scope_at_offset(&self, node: &SyntaxNode, offset: TextUnit) -> SemanticsScope<'db, DB> { 249 pub fn scope_at_offset(&self, node: &SyntaxNode, offset: TextSize) -> SemanticsScope<'db, DB> {
259 let node = self.find_file(node.clone()); 250 let node = self.find_file(node.clone());
260 let resolver = self.analyze2(node.as_ref(), Some(offset)).resolver; 251 let resolver = self.analyze2(node.as_ref(), Some(offset)).resolver;
261 SemanticsScope { db: self.db, resolver } 252 SemanticsScope { db: self.db, resolver }
@@ -271,7 +262,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
271 self.analyze2(src.as_ref(), None) 262 self.analyze2(src.as_ref(), None)
272 } 263 }
273 264
274 fn analyze2(&self, src: InFile<&SyntaxNode>, offset: Option<TextUnit>) -> SourceAnalyzer { 265 fn analyze2(&self, src: InFile<&SyntaxNode>, offset: Option<TextSize>) -> SourceAnalyzer {
275 let _p = profile("Semantics::analyze2"); 266 let _p = profile("Semantics::analyze2");
276 267
277 let container = match self.with_ctx(|ctx| ctx.find_container(src)) { 268 let container = match self.with_ctx(|ctx| ctx.find_container(src)) {
@@ -359,8 +350,8 @@ to_def_impls![
359 (crate::Const, ast::ConstDef, const_to_def), 350 (crate::Const, ast::ConstDef, const_to_def),
360 (crate::Static, ast::StaticDef, static_to_def), 351 (crate::Static, ast::StaticDef, static_to_def),
361 (crate::Function, ast::FnDef, fn_to_def), 352 (crate::Function, ast::FnDef, fn_to_def),
362 (crate::StructField, ast::RecordFieldDef, record_field_to_def), 353 (crate::Field, ast::RecordFieldDef, record_field_to_def),
363 (crate::StructField, ast::TupleFieldDef, tuple_field_to_def), 354 (crate::Field, ast::TupleFieldDef, tuple_field_to_def),
364 (crate::EnumVariant, ast::EnumVariant, enum_variant_to_def), 355 (crate::EnumVariant, ast::EnumVariant, enum_variant_to_def),
365 (crate::TypeParam, ast::TypeParam, type_param_to_def), 356 (crate::TypeParam, ast::TypeParam, type_param_to_def),
366 (crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros 357 (crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros
@@ -463,7 +454,7 @@ fn original_range_opt(
463 return None; 454 return None;
464 } 455 }
465 456
466 Some(first.with_value(first.value.text_range().extend_to(&last.value.text_range()))) 457 Some(first.with_value(first.value.text_range().cover(last.value.text_range())))
467 })?) 458 })?)
468} 459}
469 460
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs
index 66724919b..6f3b5b2da 100644
--- a/crates/ra_hir/src/semantics/source_to_def.rs
+++ b/crates/ra_hir/src/semantics/source_to_def.rs
@@ -5,8 +5,8 @@ use hir_def::{
5 dyn_map::DynMap, 5 dyn_map::DynMap,
6 expr::PatId, 6 expr::PatId,
7 keys::{self, Key}, 7 keys::{self, Key},
8 ConstId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, GenericDefId, ImplId, ModuleId, 8 ConstId, DefWithBodyId, EnumId, EnumVariantId, FieldId, FunctionId, GenericDefId, ImplId,
9 StaticId, StructFieldId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId, VariantId, 9 ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId, VariantId,
10}; 10};
11use hir_expand::{name::AsName, AstId, MacroDefKind}; 11use hir_expand::{name::AsName, AstId, MacroDefKind};
12use ra_db::FileId; 12use ra_db::FileId;
@@ -97,13 +97,13 @@ impl SourceToDefCtx<'_, '_> {
97 pub(super) fn record_field_to_def( 97 pub(super) fn record_field_to_def(
98 &mut self, 98 &mut self,
99 src: InFile<ast::RecordFieldDef>, 99 src: InFile<ast::RecordFieldDef>,
100 ) -> Option<StructFieldId> { 100 ) -> Option<FieldId> {
101 self.to_def(src, keys::RECORD_FIELD) 101 self.to_def(src, keys::RECORD_FIELD)
102 } 102 }
103 pub(super) fn tuple_field_to_def( 103 pub(super) fn tuple_field_to_def(
104 &mut self, 104 &mut self,
105 src: InFile<ast::TupleFieldDef>, 105 src: InFile<ast::TupleFieldDef>,
106 ) -> Option<StructFieldId> { 106 ) -> Option<FieldId> {
107 self.to_def(src, keys::TUPLE_FIELD) 107 self.to_def(src, keys::TUPLE_FIELD)
108 } 108 }
109 pub(super) fn enum_variant_to_def( 109 pub(super) fn enum_variant_to_def(
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 0ed6d0958..74d64c97d 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -14,7 +14,7 @@ use hir_def::{
14 }, 14 },
15 expr::{ExprId, Pat, PatId}, 15 expr::{ExprId, Pat, PatId},
16 resolver::{resolver_for_scope, Resolver, TypeNs, ValueNs}, 16 resolver::{resolver_for_scope, Resolver, TypeNs, ValueNs},
17 AsMacroCall, DefWithBodyId, LocalStructFieldId, StructFieldId, VariantId, 17 AsMacroCall, DefWithBodyId, FieldId, LocalFieldId, VariantId,
18}; 18};
19use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile}; 19use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
20use hir_ty::{ 20use hir_ty::{
@@ -23,12 +23,12 @@ use hir_ty::{
23}; 23};
24use ra_syntax::{ 24use ra_syntax::{
25 ast::{self, AstNode}, 25 ast::{self, AstNode},
26 SyntaxNode, TextRange, TextUnit, 26 SyntaxNode, TextRange, TextSize,
27}; 27};
28 28
29use crate::{ 29use crate::{
30 db::HirDatabase, semantics::PathResolution, Adt, Const, EnumVariant, Function, Local, MacroDef, 30 db::HirDatabase, semantics::PathResolution, Adt, Const, EnumVariant, Field, Function, Local,
31 ModPath, ModuleDef, Path, PathKind, Static, Struct, StructField, Trait, Type, TypeAlias, 31 MacroDef, ModPath, ModuleDef, Path, PathKind, Static, Struct, Trait, Type, TypeAlias,
32 TypeParam, 32 TypeParam,
33}; 33};
34use ra_db::CrateId; 34use ra_db::CrateId;
@@ -50,7 +50,7 @@ impl SourceAnalyzer {
50 db: &dyn HirDatabase, 50 db: &dyn HirDatabase,
51 def: DefWithBodyId, 51 def: DefWithBodyId,
52 node: InFile<&SyntaxNode>, 52 node: InFile<&SyntaxNode>,
53 offset: Option<TextUnit>, 53 offset: Option<TextSize>,
54 ) -> SourceAnalyzer { 54 ) -> SourceAnalyzer {
55 let (body, source_map) = db.body_with_source_map(def); 55 let (body, source_map) = db.body_with_source_map(def);
56 let scopes = db.expr_scopes(def); 56 let scopes = db.expr_scopes(def);
@@ -140,7 +140,7 @@ impl SourceAnalyzer {
140 &self, 140 &self,
141 db: &dyn HirDatabase, 141 db: &dyn HirDatabase,
142 field: &ast::FieldExpr, 142 field: &ast::FieldExpr,
143 ) -> Option<StructField> { 143 ) -> Option<Field> {
144 let expr_id = self.expr_id(db, &field.clone().into())?; 144 let expr_id = self.expr_id(db, &field.clone().into())?;
145 self.infer.as_ref()?.field_resolution(expr_id).map(|it| it.into()) 145 self.infer.as_ref()?.field_resolution(expr_id).map(|it| it.into())
146 } 146 }
@@ -149,7 +149,7 @@ impl SourceAnalyzer {
149 &self, 149 &self,
150 db: &dyn HirDatabase, 150 db: &dyn HirDatabase,
151 field: &ast::RecordField, 151 field: &ast::RecordField,
152 ) -> Option<(StructField, Option<Local>)> { 152 ) -> Option<(Field, Option<Local>)> {
153 let expr = field.expr()?; 153 let expr = field.expr()?;
154 let expr_id = self.expr_id(db, &expr)?; 154 let expr_id = self.expr_id(db, &expr)?;
155 let local = if field.name_ref().is_some() { 155 let local = if field.name_ref().is_some() {
@@ -172,7 +172,7 @@ impl SourceAnalyzer {
172 &self, 172 &self,
173 _db: &dyn HirDatabase, 173 _db: &dyn HirDatabase,
174 field: &ast::RecordFieldPat, 174 field: &ast::RecordFieldPat,
175 ) -> Option<StructField> { 175 ) -> Option<Field> {
176 let pat_id = self.pat_id(&field.pat()?)?; 176 let pat_id = self.pat_id(&field.pat()?)?;
177 let struct_field = self.infer.as_ref()?.record_field_pat_resolution(pat_id)?; 177 let struct_field = self.infer.as_ref()?.record_field_pat_resolution(pat_id)?;
178 Some(struct_field.into()) 178 Some(struct_field.into())
@@ -232,7 +232,7 @@ impl SourceAnalyzer {
232 &self, 232 &self,
233 db: &dyn HirDatabase, 233 db: &dyn HirDatabase,
234 literal: &ast::RecordLit, 234 literal: &ast::RecordLit,
235 ) -> Option<Vec<(StructField, Type)>> { 235 ) -> Option<Vec<(Field, Type)>> {
236 let krate = self.resolver.krate()?; 236 let krate = self.resolver.krate()?;
237 let body = self.body.as_ref()?; 237 let body = self.body.as_ref()?;
238 let infer = self.infer.as_ref()?; 238 let infer = self.infer.as_ref()?;
@@ -253,7 +253,7 @@ impl SourceAnalyzer {
253 &self, 253 &self,
254 db: &dyn HirDatabase, 254 db: &dyn HirDatabase,
255 pattern: &ast::RecordPat, 255 pattern: &ast::RecordPat,
256 ) -> Option<Vec<(StructField, Type)>> { 256 ) -> Option<Vec<(Field, Type)>> {
257 let krate = self.resolver.krate()?; 257 let krate = self.resolver.krate()?;
258 let body = self.body.as_ref()?; 258 let body = self.body.as_ref()?;
259 let infer = self.infer.as_ref()?; 259 let infer = self.infer.as_ref()?;
@@ -276,14 +276,14 @@ impl SourceAnalyzer {
276 krate: CrateId, 276 krate: CrateId,
277 substs: &Substs, 277 substs: &Substs,
278 variant: VariantId, 278 variant: VariantId,
279 missing_fields: Vec<LocalStructFieldId>, 279 missing_fields: Vec<LocalFieldId>,
280 ) -> Vec<(StructField, Type)> { 280 ) -> Vec<(Field, Type)> {
281 let field_types = db.field_types(variant); 281 let field_types = db.field_types(variant);
282 282
283 missing_fields 283 missing_fields
284 .into_iter() 284 .into_iter()
285 .map(|local_id| { 285 .map(|local_id| {
286 let field = StructFieldId { parent: variant, local_id }; 286 let field = FieldId { parent: variant, local_id };
287 let ty = field_types[local_id].clone().subst(substs); 287 let ty = field_types[local_id].clone().subst(substs);
288 (field.into(), Type::new_with_resolver_inner(db, krate, &self.resolver, ty)) 288 (field.into(), Type::new_with_resolver_inner(db, krate, &self.resolver, ty))
289 }) 289 })
@@ -318,7 +318,7 @@ fn scope_for_offset(
318 db: &dyn HirDatabase, 318 db: &dyn HirDatabase,
319 scopes: &ExprScopes, 319 scopes: &ExprScopes,
320 source_map: &BodySourceMap, 320 source_map: &BodySourceMap,
321 offset: InFile<TextUnit>, 321 offset: InFile<TextSize>,
322) -> Option<ScopeId> { 322) -> Option<ScopeId> {
323 scopes 323 scopes
324 .scope_by_expr() 324 .scope_by_expr()
@@ -354,7 +354,7 @@ fn adjust(
354 source_map: &BodySourceMap, 354 source_map: &BodySourceMap,
355 expr_range: TextRange, 355 expr_range: TextRange,
356 file_id: HirFileId, 356 file_id: HirFileId,
357 offset: TextUnit, 357 offset: TextSize,
358) -> Option<ScopeId> { 358) -> Option<ScopeId> {
359 let child_scopes = scopes 359 let child_scopes = scopes
360 .scope_by_expr() 360 .scope_by_expr()
@@ -369,15 +369,15 @@ fn adjust(
369 let node = source.value.to_node(&root); 369 let node = source.value.to_node(&root);
370 Some((node.syntax().text_range(), scope)) 370 Some((node.syntax().text_range(), scope))
371 }) 371 })
372 .filter(|(range, _)| { 372 .filter(|&(range, _)| {
373 range.start() <= offset && range.is_subrange(&expr_range) && *range != expr_range 373 range.start() <= offset && expr_range.contains_range(range) && range != expr_range
374 }); 374 });
375 375
376 child_scopes 376 child_scopes
377 .max_by(|(r1, _), (r2, _)| { 377 .max_by(|&(r1, _), &(r2, _)| {
378 if r2.is_subrange(&r1) { 378 if r1.contains_range(r2) {
379 std::cmp::Ordering::Greater 379 std::cmp::Ordering::Greater
380 } else if r1.is_subrange(&r2) { 380 } else if r2.contains_range(r1) {
381 std::cmp::Ordering::Less 381 std::cmp::Ordering::Less
382 } else { 382 } else {
383 r1.start().cmp(&r2.start()) 383 r1.start().cmp(&r2.start())
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index 7c0d93691..753becc3d 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -14,7 +14,7 @@ use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner};
14use crate::{ 14use crate::{
15 body::CfgExpander, db::DefDatabase, src::HasChildSource, src::HasSource, trace::Trace, 15 body::CfgExpander, db::DefDatabase, src::HasChildSource, src::HasSource, trace::Trace,
16 type_ref::TypeRef, visibility::RawVisibility, EnumId, HasModule, LocalEnumVariantId, 16 type_ref::TypeRef, visibility::RawVisibility, EnumId, HasModule, LocalEnumVariantId,
17 LocalStructFieldId, Lookup, ModuleId, StructId, UnionId, VariantId, 17 LocalFieldId, Lookup, ModuleId, StructId, UnionId, VariantId,
18}; 18};
19 19
20/// Note that we use `StructData` for unions as well! 20/// Note that we use `StructData` for unions as well!
@@ -38,14 +38,14 @@ pub struct EnumVariantData {
38 38
39#[derive(Debug, Clone, PartialEq, Eq)] 39#[derive(Debug, Clone, PartialEq, Eq)]
40pub enum VariantData { 40pub enum VariantData {
41 Record(Arena<StructFieldData>), 41 Record(Arena<FieldData>),
42 Tuple(Arena<StructFieldData>), 42 Tuple(Arena<FieldData>),
43 Unit, 43 Unit,
44} 44}
45 45
46/// A single field of an enum variant or struct 46/// A single field of an enum variant or struct
47#[derive(Debug, Clone, PartialEq, Eq)] 47#[derive(Debug, Clone, PartialEq, Eq)]
48pub struct StructFieldData { 48pub struct FieldData {
49 pub name: Name, 49 pub name: Name,
50 pub type_ref: TypeRef, 50 pub type_ref: TypeRef,
51 pub visibility: RawVisibility, 51 pub visibility: RawVisibility,
@@ -133,15 +133,15 @@ impl VariantData {
133 } 133 }
134 } 134 }
135 135
136 pub fn fields(&self) -> &Arena<StructFieldData> { 136 pub fn fields(&self) -> &Arena<FieldData> {
137 const EMPTY: &Arena<StructFieldData> = &Arena::new(); 137 const EMPTY: &Arena<FieldData> = &Arena::new();
138 match &self { 138 match &self {
139 VariantData::Record(fields) | VariantData::Tuple(fields) => fields, 139 VariantData::Record(fields) | VariantData::Tuple(fields) => fields,
140 _ => EMPTY, 140 _ => EMPTY,
141 } 141 }
142 } 142 }
143 143
144 pub fn field(&self, name: &Name) -> Option<LocalStructFieldId> { 144 pub fn field(&self, name: &Name) -> Option<LocalFieldId> {
145 self.fields().iter().find_map(|(id, data)| if &data.name == name { Some(id) } else { None }) 145 self.fields().iter().find_map(|(id, data)| if &data.name == name { Some(id) } else { None })
146 } 146 }
147 147
@@ -155,7 +155,7 @@ impl VariantData {
155} 155}
156 156
157impl HasChildSource for VariantId { 157impl HasChildSource for VariantId {
158 type ChildId = LocalStructFieldId; 158 type ChildId = LocalFieldId;
159 type Value = Either<ast::TupleFieldDef, ast::RecordFieldDef>; 159 type Value = Either<ast::TupleFieldDef, ast::RecordFieldDef>;
160 160
161 fn child_source(&self, db: &dyn DefDatabase) -> InFile<ArenaMap<Self::ChildId, Self::Value>> { 161 fn child_source(&self, db: &dyn DefDatabase) -> InFile<ArenaMap<Self::ChildId, Self::Value>> {
@@ -195,7 +195,7 @@ pub enum StructKind {
195fn lower_struct( 195fn lower_struct(
196 db: &dyn DefDatabase, 196 db: &dyn DefDatabase,
197 expander: &mut CfgExpander, 197 expander: &mut CfgExpander,
198 trace: &mut Trace<StructFieldData, Either<ast::TupleFieldDef, ast::RecordFieldDef>>, 198 trace: &mut Trace<FieldData, Either<ast::TupleFieldDef, ast::RecordFieldDef>>,
199 ast: &InFile<ast::StructKind>, 199 ast: &InFile<ast::StructKind>,
200) -> StructKind { 200) -> StructKind {
201 match &ast.value { 201 match &ast.value {
@@ -208,7 +208,7 @@ fn lower_struct(
208 208
209 trace.alloc( 209 trace.alloc(
210 || Either::Left(fd.clone()), 210 || Either::Left(fd.clone()),
211 || StructFieldData { 211 || FieldData {
212 name: Name::new_tuple_field(i), 212 name: Name::new_tuple_field(i),
213 type_ref: TypeRef::from_ast_opt(fd.type_ref()), 213 type_ref: TypeRef::from_ast_opt(fd.type_ref()),
214 visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())), 214 visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())),
@@ -226,7 +226,7 @@ fn lower_struct(
226 226
227 trace.alloc( 227 trace.alloc(
228 || Either::Right(fd.clone()), 228 || Either::Right(fd.clone()),
229 || StructFieldData { 229 || FieldData {
230 name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing), 230 name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing),
231 type_ref: TypeRef::from_ast_opt(fd.ascribed_type()), 231 type_ref: TypeRef::from_ast_opt(fd.ascribed_type()),
232 visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())), 232 visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())),
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 2f2e3e5ba..714a66b02 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -43,7 +43,7 @@ impl Attrs {
43 }; 43 };
44 Attrs::from_attrs_owner(db, src.as_ref().map(|it| it as &dyn AttrsOwner)) 44 Attrs::from_attrs_owner(db, src.as_ref().map(|it| it as &dyn AttrsOwner))
45 } 45 }
46 AttrDefId::StructFieldId(it) => { 46 AttrDefId::FieldId(it) => {
47 let src = it.parent.child_source(db); 47 let src = it.parent.child_source(db);
48 match &src.value[it.local_id] { 48 match &src.value[it.local_id] {
49 Either::Left(_tuple) => Attrs::default(), 49 Either::Left(_tuple) => Attrs::default(),
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs
index 5b36a7cc1..86f953c80 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/ra_hir_def/src/body/scope.rs
@@ -194,7 +194,7 @@ mod tests {
194 let (off, code) = extract_offset(code); 194 let (off, code) = extract_offset(code);
195 let code = { 195 let code = {
196 let mut buf = String::new(); 196 let mut buf = String::new();
197 let off = off.to_usize(); 197 let off: usize = off.into();
198 buf.push_str(&code[..off]); 198 buf.push_str(&code[..off]);
199 buf.push_str("marker"); 199 buf.push_str("marker");
200 buf.push_str(&code[off..]); 200 buf.push_str(&code[off..]);
diff --git a/crates/ra_hir_def/src/child_by_source.rs b/crates/ra_hir_def/src/child_by_source.rs
index 7009f21d1..a885ec96d 100644
--- a/crates/ra_hir_def/src/child_by_source.rs
+++ b/crates/ra_hir_def/src/child_by_source.rs
@@ -12,8 +12,8 @@ use crate::{
12 item_scope::ItemScope, 12 item_scope::ItemScope,
13 keys, 13 keys,
14 src::{HasChildSource, HasSource}, 14 src::{HasChildSource, HasSource},
15 AdtId, AssocItemId, DefWithBodyId, EnumId, EnumVariantId, ImplId, Lookup, ModuleDefId, 15 AdtId, AssocItemId, DefWithBodyId, EnumId, EnumVariantId, FieldId, ImplId, Lookup, ModuleDefId,
16 ModuleId, StructFieldId, TraitId, VariantId, 16 ModuleId, TraitId, VariantId,
17}; 17};
18 18
19pub trait ChildBySource { 19pub trait ChildBySource {
@@ -140,7 +140,7 @@ impl ChildBySource for VariantId {
140 let arena_map = self.child_source(db); 140 let arena_map = self.child_source(db);
141 let arena_map = arena_map.as_ref(); 141 let arena_map = arena_map.as_ref();
142 for (local_id, source) in arena_map.value.iter() { 142 for (local_id, source) in arena_map.value.iter() {
143 let id = StructFieldId { parent: *self, local_id }; 143 let id = FieldId { parent: *self, local_id };
144 match source { 144 match source {
145 Either::Left(source) => { 145 Either::Left(source) => {
146 res[keys::TUPLE_FIELD].insert(arena_map.with_value(source.clone()), id) 146 res[keys::TUPLE_FIELD].insert(arena_map.with_value(source.clone()), id)
diff --git a/crates/ra_hir_def/src/docs.rs b/crates/ra_hir_def/src/docs.rs
index 0539a77d4..b221ae1ce 100644
--- a/crates/ra_hir_def/src/docs.rs
+++ b/crates/ra_hir_def/src/docs.rs
@@ -43,7 +43,7 @@ impl Documentation {
43 let src = def_map[module.local_id].declaration_source(db)?; 43 let src = def_map[module.local_id].declaration_source(db)?;
44 docs_from_ast(&src.value) 44 docs_from_ast(&src.value)
45 } 45 }
46 AttrDefId::StructFieldId(it) => { 46 AttrDefId::FieldId(it) => {
47 let src = it.parent.child_source(db); 47 let src = it.parent.child_source(db);
48 match &src.value[it.local_id] { 48 match &src.value[it.local_id] {
49 Either::Left(_tuple) => None, 49 Either::Left(_tuple) => None,
diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs
index 8cd70eb9a..a7349a21d 100644
--- a/crates/ra_hir_def/src/keys.rs
+++ b/crates/ra_hir_def/src/keys.rs
@@ -8,7 +8,7 @@ use rustc_hash::FxHashMap;
8 8
9use crate::{ 9use crate::{
10 dyn_map::{DynMap, Policy}, 10 dyn_map::{DynMap, Policy},
11 ConstId, EnumId, EnumVariantId, FunctionId, ImplId, StaticId, StructFieldId, StructId, TraitId, 11 ConstId, EnumId, EnumVariantId, FieldId, FunctionId, ImplId, StaticId, StructId, TraitId,
12 TypeAliasId, TypeParamId, UnionId, 12 TypeAliasId, TypeParamId, UnionId,
13}; 13};
14 14
@@ -25,8 +25,8 @@ pub const UNION: Key<ast::UnionDef, UnionId> = Key::new();
25pub const ENUM: Key<ast::EnumDef, EnumId> = Key::new(); 25pub const ENUM: Key<ast::EnumDef, EnumId> = Key::new();
26 26
27pub const ENUM_VARIANT: Key<ast::EnumVariant, EnumVariantId> = Key::new(); 27pub const ENUM_VARIANT: Key<ast::EnumVariant, EnumVariantId> = Key::new();
28pub const TUPLE_FIELD: Key<ast::TupleFieldDef, StructFieldId> = Key::new(); 28pub const TUPLE_FIELD: Key<ast::TupleFieldDef, FieldId> = Key::new();
29pub const RECORD_FIELD: Key<ast::RecordFieldDef, StructFieldId> = Key::new(); 29pub const RECORD_FIELD: Key<ast::RecordFieldDef, FieldId> = Key::new();
30pub const TYPE_PARAM: Key<ast::TypeParam, TypeParamId> = Key::new(); 30pub const TYPE_PARAM: Key<ast::TypeParam, TypeParamId> = Key::new();
31 31
32pub const MACRO: Key<ast::MacroCall, MacroDefId> = Key::new(); 32pub const MACRO: Key<ast::MacroCall, MacroDefId> = Key::new();
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index 2d27bbdf8..518772e8a 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -133,12 +133,12 @@ pub struct EnumVariantId {
133pub type LocalEnumVariantId = Idx<adt::EnumVariantData>; 133pub type LocalEnumVariantId = Idx<adt::EnumVariantData>;
134 134
135#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 135#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
136pub struct StructFieldId { 136pub struct FieldId {
137 pub parent: VariantId, 137 pub parent: VariantId,
138 pub local_id: LocalStructFieldId, 138 pub local_id: LocalFieldId,
139} 139}
140 140
141pub type LocalStructFieldId = Idx<adt::StructFieldData>; 141pub type LocalFieldId = Idx<adt::FieldData>;
142 142
143#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 143#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
144pub struct ConstId(salsa::InternId); 144pub struct ConstId(salsa::InternId);
@@ -299,7 +299,7 @@ impl From<AssocItemId> for GenericDefId {
299#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] 299#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
300pub enum AttrDefId { 300pub enum AttrDefId {
301 ModuleId(ModuleId), 301 ModuleId(ModuleId),
302 StructFieldId(StructFieldId), 302 FieldId(FieldId),
303 AdtId(AdtId), 303 AdtId(AdtId),
304 FunctionId(FunctionId), 304 FunctionId(FunctionId),
305 EnumVariantId(EnumVariantId), 305 EnumVariantId(EnumVariantId),
@@ -313,7 +313,7 @@ pub enum AttrDefId {
313 313
314impl_froms!( 314impl_froms!(
315 AttrDefId: ModuleId, 315 AttrDefId: ModuleId,
316 StructFieldId, 316 FieldId,
317 AdtId(StructId, EnumId, UnionId), 317 AdtId(StructId, EnumId, UnionId),
318 EnumVariantId, 318 EnumVariantId,
319 StaticId, 319 StaticId,
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index 3da137f2e..e0fef613d 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -2,7 +2,7 @@
2use crate::db::AstDatabase; 2use crate::db::AstDatabase;
3use crate::{ 3use crate::{
4 ast::{self, AstToken, HasStringValue}, 4 ast::{self, AstToken, HasStringValue},
5 name, AstId, CrateId, MacroDefId, MacroDefKind, TextUnit, 5 name, AstId, CrateId, MacroDefId, MacroDefKind, TextSize,
6}; 6};
7 7
8use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId}; 8use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId};
@@ -127,7 +127,7 @@ fn stringify_expand(
127 let arg = loc.kind.arg(db).ok_or_else(|| mbe::ExpandError::UnexpectedToken)?; 127 let arg = loc.kind.arg(db).ok_or_else(|| mbe::ExpandError::UnexpectedToken)?;
128 let macro_args = arg; 128 let macro_args = arg;
129 let text = macro_args.text(); 129 let text = macro_args.text();
130 let without_parens = TextUnit::of_char('(')..text.len() - TextUnit::of_char(')'); 130 let without_parens = TextSize::of('(')..text.len() - TextSize::of(')');
131 text.slice(without_parens).to_string() 131 text.slice(without_parens).to_string()
132 }; 132 };
133 133
@@ -358,7 +358,7 @@ fn env_expand(
358 // However, we cannot use an empty string here, because for 358 // However, we cannot use an empty string here, because for
359 // `include!(concat!(env!("OUT_DIR"), "/foo.rs"))` will become 359 // `include!(concat!(env!("OUT_DIR"), "/foo.rs"))` will become
360 // `include!("foo.rs"), which might go to infinite loop 360 // `include!("foo.rs"), which might go to infinite loop
361 let s = get_env_inner(db, arg_id, &key).unwrap_or("__RA_UNIMPLEMENTATED__".to_string()); 361 let s = get_env_inner(db, arg_id, &key).unwrap_or_else(|| "__RA_UNIMPLEMENTATED__".to_string());
362 let expanded = quote! { #s }; 362 let expanded = quote! { #s };
363 363
364 Ok((expanded, FragmentKind::Expr)) 364 Ok((expanded, FragmentKind::Expr))
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 86299459f..754a0f005 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -22,7 +22,7 @@ use ra_db::{impl_intern_key, salsa, CrateId, FileId};
22use ra_syntax::{ 22use ra_syntax::{
23 algo, 23 algo,
24 ast::{self, AstNode}, 24 ast::{self, AstNode},
25 SyntaxNode, SyntaxToken, TextUnit, 25 SyntaxNode, SyntaxToken, TextSize,
26}; 26};
27 27
28use crate::ast_id_map::FileAstId; 28use crate::ast_id_map::FileAstId;
@@ -348,7 +348,7 @@ impl<N: AstNode> AstId<N> {
348/// 348///
349/// * `InFile<SyntaxNode>` -- syntax node in a file 349/// * `InFile<SyntaxNode>` -- syntax node in a file
350/// * `InFile<ast::FnDef>` -- ast node in a file 350/// * `InFile<ast::FnDef>` -- ast node in a file
351/// * `InFile<TextUnit>` -- offset in a file 351/// * `InFile<TextSize>` -- offset in a file
352#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)] 352#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
353pub struct InFile<T> { 353pub struct InFile<T> {
354 pub file_id: HirFileId, 354 pub file_id: HirFileId,
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs
index 9e5dfeab3..fdb49560b 100644
--- a/crates/ra_hir_ty/src/db.rs
+++ b/crates/ra_hir_ty/src/db.rs
@@ -3,7 +3,7 @@
3use std::sync::Arc; 3use std::sync::Arc;
4 4
5use hir_def::{ 5use hir_def::{
6 db::DefDatabase, DefWithBodyId, GenericDefId, ImplId, LocalStructFieldId, TraitId, TypeParamId, 6 db::DefDatabase, DefWithBodyId, GenericDefId, ImplId, LocalFieldId, TraitId, TypeParamId,
7 VariantId, 7 VariantId,
8}; 8};
9use ra_arena::map::ArenaMap; 9use ra_arena::map::ArenaMap;
@@ -43,7 +43,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
43 fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>; 43 fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>;
44 44
45 #[salsa::invoke(crate::lower::field_types_query)] 45 #[salsa::invoke(crate::lower::field_types_query)]
46 fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalStructFieldId, Binders<Ty>>>; 46 fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>>;
47 47
48 #[salsa::invoke(crate::callable_item_sig)] 48 #[salsa::invoke(crate::callable_item_sig)]
49 fn callable_item_signature(&self, def: CallableDef) -> PolyFnSig; 49 fn callable_item_signature(&self, def: CallableDef) -> PolyFnSig;
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs
index fd59f4320..f04968e14 100644
--- a/crates/ra_hir_ty/src/expr.rs
+++ b/crates/ra_hir_ty/src/expr.rs
@@ -24,7 +24,7 @@ pub use hir_def::{
24 ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Literal, LogicOp, 24 ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Literal, LogicOp,
25 MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, UnaryOp, 25 MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, UnaryOp,
26 }, 26 },
27 LocalStructFieldId, VariantId, 27 LocalFieldId, VariantId,
28}; 28};
29 29
30pub struct ExprValidator<'a, 'b: 'a> { 30pub struct ExprValidator<'a, 'b: 'a> {
@@ -83,7 +83,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
83 id: ExprId, 83 id: ExprId,
84 db: &dyn HirDatabase, 84 db: &dyn HirDatabase,
85 variant_def: VariantId, 85 variant_def: VariantId,
86 missed_fields: Vec<LocalStructFieldId>, 86 missed_fields: Vec<LocalFieldId>,
87 ) { 87 ) {
88 // XXX: only look at source_map if we do have missing fields 88 // XXX: only look at source_map if we do have missing fields
89 let (_, source_map) = db.body_with_source_map(self.func.into()); 89 let (_, source_map) = db.body_with_source_map(self.func.into());
@@ -112,7 +112,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
112 id: PatId, 112 id: PatId,
113 db: &dyn HirDatabase, 113 db: &dyn HirDatabase,
114 variant_def: VariantId, 114 variant_def: VariantId,
115 missed_fields: Vec<LocalStructFieldId>, 115 missed_fields: Vec<LocalFieldId>,
116 ) { 116 ) {
117 // XXX: only look at source_map if we do have missing fields 117 // XXX: only look at source_map if we do have missing fields
118 let (_, source_map) = db.body_with_source_map(self.func.into()); 118 let (_, source_map) = db.body_with_source_map(self.func.into());
@@ -256,7 +256,7 @@ pub fn record_literal_missing_fields(
256 infer: &InferenceResult, 256 infer: &InferenceResult,
257 id: ExprId, 257 id: ExprId,
258 expr: &Expr, 258 expr: &Expr,
259) -> Option<(VariantId, Vec<LocalStructFieldId>, /*exhaustive*/ bool)> { 259) -> Option<(VariantId, Vec<LocalFieldId>, /*exhaustive*/ bool)> {
260 let (fields, exhausitve) = match expr { 260 let (fields, exhausitve) = match expr {
261 Expr::RecordLit { path: _, fields, spread } => (fields, spread.is_none()), 261 Expr::RecordLit { path: _, fields, spread } => (fields, spread.is_none()),
262 _ => return None, 262 _ => return None,
@@ -270,7 +270,7 @@ pub fn record_literal_missing_fields(
270 let variant_data = variant_data(db.upcast(), variant_def); 270 let variant_data = variant_data(db.upcast(), variant_def);
271 271
272 let specified_fields: FxHashSet<_> = fields.iter().map(|f| &f.name).collect(); 272 let specified_fields: FxHashSet<_> = fields.iter().map(|f| &f.name).collect();
273 let missed_fields: Vec<LocalStructFieldId> = variant_data 273 let missed_fields: Vec<LocalFieldId> = variant_data
274 .fields() 274 .fields()
275 .iter() 275 .iter()
276 .filter_map(|(f, d)| if specified_fields.contains(&d.name) { None } else { Some(f) }) 276 .filter_map(|(f, d)| if specified_fields.contains(&d.name) { None } else { Some(f) })
@@ -286,7 +286,7 @@ pub fn record_pattern_missing_fields(
286 infer: &InferenceResult, 286 infer: &InferenceResult,
287 id: PatId, 287 id: PatId,
288 pat: &Pat, 288 pat: &Pat,
289) -> Option<(VariantId, Vec<LocalStructFieldId>, /*exhaustive*/ bool)> { 289) -> Option<(VariantId, Vec<LocalFieldId>, /*exhaustive*/ bool)> {
290 let (fields, exhaustive) = match pat { 290 let (fields, exhaustive) = match pat {
291 Pat::Record { path: _, args, ellipsis } => (args, !ellipsis), 291 Pat::Record { path: _, args, ellipsis } => (args, !ellipsis),
292 _ => return None, 292 _ => return None,
@@ -300,7 +300,7 @@ pub fn record_pattern_missing_fields(
300 let variant_data = variant_data(db.upcast(), variant_def); 300 let variant_data = variant_data(db.upcast(), variant_def);
301 301
302 let specified_fields: FxHashSet<_> = fields.iter().map(|f| &f.name).collect(); 302 let specified_fields: FxHashSet<_> = fields.iter().map(|f| &f.name).collect();
303 let missed_fields: Vec<LocalStructFieldId> = variant_data 303 let missed_fields: Vec<LocalFieldId> = variant_data
304 .fields() 304 .fields()
305 .iter() 305 .iter()
306 .filter_map(|(f, d)| if specified_fields.contains(&d.name) { None } else { Some(f) }) 306 .filter_map(|(f, d)| if specified_fields.contains(&d.name) { None } else { Some(f) })
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index dfb6a435f..6a53be621 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -28,7 +28,7 @@ use hir_def::{
28 path::{path, Path}, 28 path::{path, Path},
29 resolver::{HasResolver, Resolver, TypeNs}, 29 resolver::{HasResolver, Resolver, TypeNs},
30 type_ref::{Mutability, TypeRef}, 30 type_ref::{Mutability, TypeRef},
31 AdtId, AssocItemId, DefWithBodyId, FunctionId, StructFieldId, TraitId, TypeAliasId, VariantId, 31 AdtId, AssocItemId, DefWithBodyId, FieldId, FunctionId, TraitId, TypeAliasId, VariantId,
32}; 32};
33use hir_expand::{diagnostics::DiagnosticSink, name::name}; 33use hir_expand::{diagnostics::DiagnosticSink, name::name};
34use ra_arena::map::ArenaMap; 34use ra_arena::map::ArenaMap;
@@ -124,10 +124,10 @@ pub struct InferenceResult {
124 /// For each method call expr, records the function it resolves to. 124 /// For each method call expr, records the function it resolves to.
125 method_resolutions: FxHashMap<ExprId, FunctionId>, 125 method_resolutions: FxHashMap<ExprId, FunctionId>,
126 /// For each field access expr, records the field it resolves to. 126 /// For each field access expr, records the field it resolves to.
127 field_resolutions: FxHashMap<ExprId, StructFieldId>, 127 field_resolutions: FxHashMap<ExprId, FieldId>,
128 /// For each field in record literal, records the field it resolves to. 128 /// For each field in record literal, records the field it resolves to.
129 record_field_resolutions: FxHashMap<ExprId, StructFieldId>, 129 record_field_resolutions: FxHashMap<ExprId, FieldId>,
130 record_field_pat_resolutions: FxHashMap<PatId, StructFieldId>, 130 record_field_pat_resolutions: FxHashMap<PatId, FieldId>,
131 /// For each struct literal, records the variant it resolves to. 131 /// For each struct literal, records the variant it resolves to.
132 variant_resolutions: FxHashMap<ExprOrPatId, VariantId>, 132 variant_resolutions: FxHashMap<ExprOrPatId, VariantId>,
133 /// For each associated item record what it resolves to 133 /// For each associated item record what it resolves to
@@ -142,13 +142,13 @@ impl InferenceResult {
142 pub fn method_resolution(&self, expr: ExprId) -> Option<FunctionId> { 142 pub fn method_resolution(&self, expr: ExprId) -> Option<FunctionId> {
143 self.method_resolutions.get(&expr).copied() 143 self.method_resolutions.get(&expr).copied()
144 } 144 }
145 pub fn field_resolution(&self, expr: ExprId) -> Option<StructFieldId> { 145 pub fn field_resolution(&self, expr: ExprId) -> Option<FieldId> {
146 self.field_resolutions.get(&expr).copied() 146 self.field_resolutions.get(&expr).copied()
147 } 147 }
148 pub fn record_field_resolution(&self, expr: ExprId) -> Option<StructFieldId> { 148 pub fn record_field_resolution(&self, expr: ExprId) -> Option<FieldId> {
149 self.record_field_resolutions.get(&expr).copied() 149 self.record_field_resolutions.get(&expr).copied()
150 } 150 }
151 pub fn record_field_pat_resolution(&self, pat: PatId) -> Option<StructFieldId> { 151 pub fn record_field_pat_resolution(&self, pat: PatId) -> Option<FieldId> {
152 self.record_field_pat_resolutions.get(&pat).copied() 152 self.record_field_pat_resolutions.get(&pat).copied()
153 } 153 }
154 pub fn variant_resolution_for_expr(&self, id: ExprId) -> Option<VariantId> { 154 pub fn variant_resolution_for_expr(&self, id: ExprId) -> Option<VariantId> {
@@ -249,7 +249,7 @@ impl<'a> InferenceContext<'a> {
249 self.result.method_resolutions.insert(expr, func); 249 self.result.method_resolutions.insert(expr, func);
250 } 250 }
251 251
252 fn write_field_resolution(&mut self, expr: ExprId, field: StructFieldId) { 252 fn write_field_resolution(&mut self, expr: ExprId, field: FieldId) {
253 self.result.field_resolutions.insert(expr, field); 253 self.result.field_resolutions.insert(expr, field);
254 } 254 }
255 255
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs
index 1fdb235a0..83f946eee 100644
--- a/crates/ra_hir_ty/src/infer/expr.rs
+++ b/crates/ra_hir_ty/src/infer/expr.rs
@@ -8,7 +8,7 @@ use hir_def::{
8 expr::{Array, BinaryOp, Expr, ExprId, Literal, Statement, UnaryOp}, 8 expr::{Array, BinaryOp, Expr, ExprId, Literal, Statement, UnaryOp},
9 path::{GenericArg, GenericArgs}, 9 path::{GenericArg, GenericArgs},
10 resolver::resolver_for_expr, 10 resolver::resolver_for_expr,
11 AdtId, AssocContainerId, Lookup, StructFieldId, 11 AdtId, AssocContainerId, FieldId, Lookup,
12}; 12};
13use hir_expand::name::Name; 13use hir_expand::name::Name;
14use ra_syntax::ast::RangeOp; 14use ra_syntax::ast::RangeOp;
@@ -216,9 +216,7 @@ impl<'a> InferenceContext<'a> {
216 for (field_idx, field) in fields.iter().enumerate() { 216 for (field_idx, field) in fields.iter().enumerate() {
217 let field_def = 217 let field_def =
218 variant_data.as_ref().and_then(|it| match it.field(&field.name) { 218 variant_data.as_ref().and_then(|it| match it.field(&field.name) {
219 Some(local_id) => { 219 Some(local_id) => Some(FieldId { parent: def_id.unwrap(), local_id }),
220 Some(StructFieldId { parent: def_id.unwrap(), local_id })
221 }
222 None => { 220 None => {
223 self.push_diagnostic(InferenceDiagnostic::NoSuchField { 221 self.push_diagnostic(InferenceDiagnostic::NoSuchField {
224 expr: tgt_expr, 222 expr: tgt_expr,
@@ -257,7 +255,7 @@ impl<'a> InferenceContext<'a> {
257 .and_then(|idx| a_ty.parameters.0.get(idx).cloned()), 255 .and_then(|idx| a_ty.parameters.0.get(idx).cloned()),
258 TypeCtor::Adt(AdtId::StructId(s)) => { 256 TypeCtor::Adt(AdtId::StructId(s)) => {
259 self.db.struct_data(s).variant_data.field(name).map(|local_id| { 257 self.db.struct_data(s).variant_data.field(name).map(|local_id| {
260 let field = StructFieldId { parent: s.into(), local_id }; 258 let field = FieldId { parent: s.into(), local_id };
261 self.write_field_resolution(tgt_expr, field); 259 self.write_field_resolution(tgt_expr, field);
262 self.db.field_types(s.into())[field.local_id] 260 self.db.field_types(s.into())[field.local_id]
263 .clone() 261 .clone()
diff --git a/crates/ra_hir_ty/src/infer/pat.rs b/crates/ra_hir_ty/src/infer/pat.rs
index 7c2ad4384..54ec870df 100644
--- a/crates/ra_hir_ty/src/infer/pat.rs
+++ b/crates/ra_hir_ty/src/infer/pat.rs
@@ -7,7 +7,7 @@ use hir_def::{
7 expr::{BindingAnnotation, Pat, PatId, RecordFieldPat}, 7 expr::{BindingAnnotation, Pat, PatId, RecordFieldPat},
8 path::Path, 8 path::Path,
9 type_ref::Mutability, 9 type_ref::Mutability,
10 StructFieldId, 10 FieldId,
11}; 11};
12use hir_expand::name::Name; 12use hir_expand::name::Name;
13use test_utils::tested_by; 13use test_utils::tested_by;
@@ -69,7 +69,7 @@ impl<'a> InferenceContext<'a> {
69 for subpat in subpats { 69 for subpat in subpats {
70 let matching_field = var_data.as_ref().and_then(|it| it.field(&subpat.name)); 70 let matching_field = var_data.as_ref().and_then(|it| it.field(&subpat.name));
71 if let Some(local_id) = matching_field { 71 if let Some(local_id) = matching_field {
72 let field_def = StructFieldId { parent: def.unwrap(), local_id }; 72 let field_def = FieldId { parent: def.unwrap(), local_id };
73 self.result.record_field_pat_resolutions.insert(subpat.pat, field_def); 73 self.result.record_field_pat_resolutions.insert(subpat.pat, field_def);
74 } 74 }
75 75
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index c2812e178..b57214296 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -18,8 +18,8 @@ use hir_def::{
18 resolver::{HasResolver, Resolver, TypeNs}, 18 resolver::{HasResolver, Resolver, TypeNs},
19 type_ref::{TypeBound, TypeRef}, 19 type_ref::{TypeBound, TypeRef},
20 AdtId, AssocContainerId, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule, 20 AdtId, AssocContainerId, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule,
21 ImplId, LocalStructFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, 21 ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId,
22 UnionId, VariantId, 22 VariantId,
23}; 23};
24use ra_arena::map::ArenaMap; 24use ra_arena::map::ArenaMap;
25use ra_db::CrateId; 25use ra_db::CrateId;
@@ -682,7 +682,7 @@ pub fn callable_item_sig(db: &dyn HirDatabase, def: CallableDef) -> PolyFnSig {
682pub(crate) fn field_types_query( 682pub(crate) fn field_types_query(
683 db: &dyn HirDatabase, 683 db: &dyn HirDatabase,
684 variant_id: VariantId, 684 variant_id: VariantId,
685) -> Arc<ArenaMap<LocalStructFieldId, Binders<Ty>>> { 685) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>> {
686 let var_data = variant_data(db.upcast(), variant_id); 686 let var_data = variant_data(db.upcast(), variant_id);
687 let (resolver, def): (_, GenericDefId) = match variant_id { 687 let (resolver, def): (_, GenericDefId) = match variant_id {
688 VariantId::StructId(it) => (it.resolver(db.upcast()), it.into()), 688 VariantId::StructId(it) => (it.resolver(db.upcast()), it.into()),
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index 846005baa..b6a96bb5c 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -117,7 +117,7 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
117 let macro_prefix = if node.file_id != file_id.into() { "!" } else { "" }; 117 let macro_prefix = if node.file_id != file_id.into() { "!" } else { "" };
118 format_to!( 118 format_to!(
119 buf, 119 buf,
120 "{}{} '{}': {}\n", 120 "{}{:?} '{}': {}\n",
121 macro_prefix, 121 macro_prefix,
122 range, 122 range,
123 ellipsize(text, 15), 123 ellipsize(text, 15),
@@ -134,7 +134,7 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
134 let macro_prefix = if src_ptr.file_id != file_id.into() { "!" } else { "" }; 134 let macro_prefix = if src_ptr.file_id != file_id.into() { "!" } else { "" };
135 format_to!( 135 format_to!(
136 buf, 136 buf,
137 "{}{}: expected {}, got {}\n", 137 "{}{:?}: expected {}, got {}\n",
138 macro_prefix, 138 macro_prefix,
139 range, 139 range,
140 mismatch.expected.display(&db), 140 mismatch.expected.display(&db),
diff --git a/crates/ra_hir_ty/src/tests/coercion.rs b/crates/ra_hir_ty/src/tests/coercion.rs
index b2c971f02..e6fb3e123 100644
--- a/crates/ra_hir_ty/src/tests/coercion.rs
+++ b/crates/ra_hir_ty/src/tests/coercion.rs
@@ -29,10 +29,10 @@ fn test() {
29} 29}
30"#), 30"#),
31 @r###" 31 @r###"
32 [11; 41) '{ ...4 }; }': () 32 11..41 '{ ...4 }; }': ()
33 [21; 22) 'a': i32 33 21..22 'a': i32
34 [30; 38) '{ 1i64 }': i64 34 30..38 '{ 1i64 }': i64
35 [32; 36) '1i64': i64 35 32..36 '1i64': i64
36 "###); 36 "###);
37} 37}
38 38
@@ -63,50 +63,50 @@ fn test2() {
63} 63}
64"#), 64"#),
65 @r###" 65 @r###"
66 [31; 32) '_': &[T] 66 31..32 '_': &[T]
67 [45; 56) '{ loop {} }': T 67 45..56 '{ loop {} }': T
68 [47; 54) 'loop {}': ! 68 47..54 'loop {}': !
69 [52; 54) '{}': () 69 52..54 '{}': ()
70 [65; 66) '_': S<&[T]> 70 65..66 '_': S<&[T]>
71 [82; 93) '{ loop {} }': T 71 82..93 '{ loop {} }': T
72 [84; 91) 'loop {}': ! 72 84..91 'loop {}': !
73 [89; 91) '{}': () 73 89..91 '{}': ()
74 [122; 133) '{ loop {} }': *mut [T; _] 74 122..133 '{ loop {} }': *mut [T; _]
75 [124; 131) 'loop {}': ! 75 124..131 'loop {}': !
76 [129; 131) '{}': () 76 129..131 '{}': ()
77 [160; 173) '{ gen() }': *mut [U] 77 160..173 '{ gen() }': *mut [U]
78 [166; 169) 'gen': fn gen<U>() -> *mut [U; _] 78 166..169 'gen': fn gen<U>() -> *mut [U; _]
79 [166; 171) 'gen()': *mut [U; _] 79 166..171 'gen()': *mut [U; _]
80 [186; 420) '{ ...rr); }': () 80 186..420 '{ ...rr); }': ()
81 [196; 199) 'arr': &[u8; _] 81 196..199 'arr': &[u8; _]
82 [212; 216) '&[1]': &[u8; _] 82 212..216 '&[1]': &[u8; _]
83 [213; 216) '[1]': [u8; _] 83 213..216 '[1]': [u8; _]
84 [214; 215) '1': u8 84 214..215 '1': u8
85 [227; 228) 'a': &[u8] 85 227..228 'a': &[u8]
86 [237; 240) 'arr': &[u8; _] 86 237..240 'arr': &[u8; _]
87 [250; 251) 'b': u8 87 250..251 'b': u8
88 [254; 255) 'f': fn f<u8>(&[u8]) -> u8 88 254..255 'f': fn f<u8>(&[u8]) -> u8
89 [254; 260) 'f(arr)': u8 89 254..260 'f(arr)': u8
90 [256; 259) 'arr': &[u8; _] 90 256..259 'arr': &[u8; _]
91 [270; 271) 'c': &[u8] 91 270..271 'c': &[u8]
92 [280; 287) '{ arr }': &[u8] 92 280..287 '{ arr }': &[u8]
93 [282; 285) 'arr': &[u8; _] 93 282..285 'arr': &[u8; _]
94 [297; 298) 'd': u8 94 297..298 'd': u8
95 [301; 302) 'g': fn g<u8>(S<&[u8]>) -> u8 95 301..302 'g': fn g<u8>(S<&[u8]>) -> u8
96 [301; 316) 'g(S { a: arr })': u8 96 301..316 'g(S { a: arr })': u8
97 [303; 315) 'S { a: arr }': S<&[u8]> 97 303..315 'S { a: arr }': S<&[u8]>
98 [310; 313) 'arr': &[u8; _] 98 310..313 'arr': &[u8; _]
99 [326; 327) 'e': [&[u8]; _] 99 326..327 'e': [&[u8]; _]
100 [341; 346) '[arr]': [&[u8]; _] 100 341..346 '[arr]': [&[u8]; _]
101 [342; 345) 'arr': &[u8; _] 101 342..345 'arr': &[u8; _]
102 [356; 357) 'f': [&[u8]; _] 102 356..357 'f': [&[u8]; _]
103 [371; 379) '[arr; 2]': [&[u8]; _] 103 371..379 '[arr; 2]': [&[u8]; _]
104 [372; 375) 'arr': &[u8; _] 104 372..375 'arr': &[u8; _]
105 [377; 378) '2': usize 105 377..378 '2': usize
106 [389; 390) 'g': (&[u8], &[u8]) 106 389..390 'g': (&[u8], &[u8])
107 [407; 417) '(arr, arr)': (&[u8], &[u8]) 107 407..417 '(arr, arr)': (&[u8], &[u8])
108 [408; 411) 'arr': &[u8; _] 108 408..411 'arr': &[u8; _]
109 [413; 416) 'arr': &[u8; _] 109 413..416 'arr': &[u8; _]
110 "### 110 "###
111 ); 111 );
112} 112}
@@ -120,11 +120,11 @@ fn test() {
120} 120}
121"#), 121"#),
122 @r###" 122 @r###"
123 [11; 40) '{ ...[1]; }': () 123 11..40 '{ ...[1]; }': ()
124 [21; 22) 'x': &[i32] 124 21..22 'x': &[i32]
125 [33; 37) '&[1]': &[i32; _] 125 33..37 '&[1]': &[i32; _]
126 [34; 37) '[1]': [i32; _] 126 34..37 '[1]': [i32; _]
127 [35; 36) '1': i32 127 35..36 '1': i32
128 "###); 128 "###);
129} 129}
130 130
@@ -150,31 +150,31 @@ fn test(a: A<[u8; 2]>, b: B<[u8; 2]>, c: C<[u8; 2]>) {
150} 150}
151"#), 151"#),
152 @r###" 152 @r###"
153 [258; 259) 'x': A<[T]> 153 258..259 'x': A<[T]>
154 [279; 284) '{ x }': A<[T]> 154 279..284 '{ x }': A<[T]>
155 [281; 282) 'x': A<[T]> 155 281..282 'x': A<[T]>
156 [296; 297) 'x': B<[T]> 156 296..297 'x': B<[T]>
157 [317; 322) '{ x }': B<[T]> 157 317..322 '{ x }': B<[T]>
158 [319; 320) 'x': B<[T]> 158 319..320 'x': B<[T]>
159 [334; 335) 'x': C<[T]> 159 334..335 'x': C<[T]>
160 [355; 360) '{ x }': C<[T]> 160 355..360 '{ x }': C<[T]>
161 [357; 358) 'x': C<[T]> 161 357..358 'x': C<[T]>
162 [370; 371) 'a': A<[u8; _]> 162 370..371 'a': A<[u8; _]>
163 [385; 386) 'b': B<[u8; _]> 163 385..386 'b': B<[u8; _]>
164 [400; 401) 'c': C<[u8; _]> 164 400..401 'c': C<[u8; _]>
165 [415; 481) '{ ...(c); }': () 165 415..481 '{ ...(c); }': ()
166 [425; 426) 'd': A<[{unknown}]> 166 425..426 'd': A<[{unknown}]>
167 [429; 433) 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]> 167 429..433 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
168 [429; 436) 'foo1(a)': A<[{unknown}]> 168 429..436 'foo1(a)': A<[{unknown}]>
169 [434; 435) 'a': A<[u8; _]> 169 434..435 'a': A<[u8; _]>
170 [446; 447) 'e': B<[u8]> 170 446..447 'e': B<[u8]>
171 [450; 454) 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]> 171 450..454 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
172 [450; 457) 'foo2(b)': B<[u8]> 172 450..457 'foo2(b)': B<[u8]>
173 [455; 456) 'b': B<[u8; _]> 173 455..456 'b': B<[u8; _]>
174 [467; 468) 'f': C<[u8]> 174 467..468 'f': C<[u8]>
175 [471; 475) 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]> 175 471..475 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
176 [471; 478) 'foo3(c)': C<[u8]> 176 471..478 'foo3(c)': C<[u8]>
177 [476; 477) 'c': C<[u8; _]> 177 476..477 'c': C<[u8; _]>
178 "### 178 "###
179 ); 179 );
180} 180}
@@ -193,24 +193,24 @@ fn test() {
193} 193}
194"#), 194"#),
195 @r###" 195 @r###"
196 [11; 12) 'x': &[T] 196 11..12 'x': &[T]
197 [28; 39) '{ loop {} }': &[T] 197 28..39 '{ loop {} }': &[T]
198 [30; 37) 'loop {}': ! 198 30..37 'loop {}': !
199 [35; 37) '{}': () 199 35..37 '{}': ()
200 [50; 126) '{ ... }; }': () 200 50..126 '{ ... }; }': ()
201 [60; 61) 'x': &[i32] 201 60..61 'x': &[i32]
202 [64; 123) 'if tru... }': &[i32] 202 64..123 'if tru... }': &[i32]
203 [67; 71) 'true': bool 203 67..71 'true': bool
204 [72; 97) '{ ... }': &[i32] 204 72..97 '{ ... }': &[i32]
205 [82; 85) 'foo': fn foo<i32>(&[i32]) -> &[i32] 205 82..85 'foo': fn foo<i32>(&[i32]) -> &[i32]
206 [82; 91) 'foo(&[1])': &[i32] 206 82..91 'foo(&[1])': &[i32]
207 [86; 90) '&[1]': &[i32; _] 207 86..90 '&[1]': &[i32; _]
208 [87; 90) '[1]': [i32; _] 208 87..90 '[1]': [i32; _]
209 [88; 89) '1': i32 209 88..89 '1': i32
210 [103; 123) '{ ... }': &[i32; _] 210 103..123 '{ ... }': &[i32; _]
211 [113; 117) '&[1]': &[i32; _] 211 113..117 '&[1]': &[i32; _]
212 [114; 117) '[1]': [i32; _] 212 114..117 '[1]': [i32; _]
213 [115; 116) '1': i32 213 115..116 '1': i32
214 "### 214 "###
215 ); 215 );
216} 216}
@@ -229,24 +229,24 @@ fn test() {
229} 229}
230"#), 230"#),
231 @r###" 231 @r###"
232 [11; 12) 'x': &[T] 232 11..12 'x': &[T]
233 [28; 39) '{ loop {} }': &[T] 233 28..39 '{ loop {} }': &[T]
234 [30; 37) 'loop {}': ! 234 30..37 'loop {}': !
235 [35; 37) '{}': () 235 35..37 '{}': ()
236 [50; 126) '{ ... }; }': () 236 50..126 '{ ... }; }': ()
237 [60; 61) 'x': &[i32] 237 60..61 'x': &[i32]
238 [64; 123) 'if tru... }': &[i32] 238 64..123 'if tru... }': &[i32]
239 [67; 71) 'true': bool 239 67..71 'true': bool
240 [72; 92) '{ ... }': &[i32; _] 240 72..92 '{ ... }': &[i32; _]
241 [82; 86) '&[1]': &[i32; _] 241 82..86 '&[1]': &[i32; _]
242 [83; 86) '[1]': [i32; _] 242 83..86 '[1]': [i32; _]
243 [84; 85) '1': i32 243 84..85 '1': i32
244 [98; 123) '{ ... }': &[i32] 244 98..123 '{ ... }': &[i32]
245 [108; 111) 'foo': fn foo<i32>(&[i32]) -> &[i32] 245 108..111 'foo': fn foo<i32>(&[i32]) -> &[i32]
246 [108; 117) 'foo(&[1])': &[i32] 246 108..117 'foo(&[1])': &[i32]
247 [112; 116) '&[1]': &[i32; _] 247 112..116 '&[1]': &[i32; _]
248 [113; 116) '[1]': [i32; _] 248 113..116 '[1]': [i32; _]
249 [114; 115) '1': i32 249 114..115 '1': i32
250 "### 250 "###
251 ); 251 );
252} 252}
@@ -265,31 +265,31 @@ fn test(i: i32) {
265} 265}
266"#), 266"#),
267 @r###" 267 @r###"
268 [11; 12) 'x': &[T] 268 11..12 'x': &[T]
269 [28; 39) '{ loop {} }': &[T] 269 28..39 '{ loop {} }': &[T]
270 [30; 37) 'loop {}': ! 270 30..37 'loop {}': !
271 [35; 37) '{}': () 271 35..37 '{}': ()
272 [48; 49) 'i': i32 272 48..49 'i': i32
273 [56; 150) '{ ... }; }': () 273 56..150 '{ ... }; }': ()
274 [66; 67) 'x': &[i32] 274 66..67 'x': &[i32]
275 [70; 147) 'match ... }': &[i32] 275 70..147 'match ... }': &[i32]
276 [76; 77) 'i': i32 276 76..77 'i': i32
277 [88; 89) '2': i32 277 88..89 '2': i32
278 [88; 89) '2': i32 278 88..89 '2': i32
279 [93; 96) 'foo': fn foo<i32>(&[i32]) -> &[i32] 279 93..96 'foo': fn foo<i32>(&[i32]) -> &[i32]
280 [93; 102) 'foo(&[2])': &[i32] 280 93..102 'foo(&[2])': &[i32]
281 [97; 101) '&[2]': &[i32; _] 281 97..101 '&[2]': &[i32; _]
282 [98; 101) '[2]': [i32; _] 282 98..101 '[2]': [i32; _]
283 [99; 100) '2': i32 283 99..100 '2': i32
284 [112; 113) '1': i32 284 112..113 '1': i32
285 [112; 113) '1': i32 285 112..113 '1': i32
286 [117; 121) '&[1]': &[i32; _] 286 117..121 '&[1]': &[i32; _]
287 [118; 121) '[1]': [i32; _] 287 118..121 '[1]': [i32; _]
288 [119; 120) '1': i32 288 119..120 '1': i32
289 [131; 132) '_': i32 289 131..132 '_': i32
290 [136; 140) '&[3]': &[i32; _] 290 136..140 '&[3]': &[i32; _]
291 [137; 140) '[3]': [i32; _] 291 137..140 '[3]': [i32; _]
292 [138; 139) '3': i32 292 138..139 '3': i32
293 "### 293 "###
294 ); 294 );
295} 295}
@@ -308,31 +308,31 @@ fn test(i: i32) {
308} 308}
309"#), 309"#),
310 @r###" 310 @r###"
311 [11; 12) 'x': &[T] 311 11..12 'x': &[T]
312 [28; 39) '{ loop {} }': &[T] 312 28..39 '{ loop {} }': &[T]
313 [30; 37) 'loop {}': ! 313 30..37 'loop {}': !
314 [35; 37) '{}': () 314 35..37 '{}': ()
315 [48; 49) 'i': i32 315 48..49 'i': i32
316 [56; 150) '{ ... }; }': () 316 56..150 '{ ... }; }': ()
317 [66; 67) 'x': &[i32] 317 66..67 'x': &[i32]
318 [70; 147) 'match ... }': &[i32] 318 70..147 'match ... }': &[i32]
319 [76; 77) 'i': i32 319 76..77 'i': i32
320 [88; 89) '1': i32 320 88..89 '1': i32
321 [88; 89) '1': i32 321 88..89 '1': i32
322 [93; 97) '&[1]': &[i32; _] 322 93..97 '&[1]': &[i32; _]
323 [94; 97) '[1]': [i32; _] 323 94..97 '[1]': [i32; _]
324 [95; 96) '1': i32 324 95..96 '1': i32
325 [107; 108) '2': i32 325 107..108 '2': i32
326 [107; 108) '2': i32 326 107..108 '2': i32
327 [112; 115) 'foo': fn foo<i32>(&[i32]) -> &[i32] 327 112..115 'foo': fn foo<i32>(&[i32]) -> &[i32]
328 [112; 121) 'foo(&[2])': &[i32] 328 112..121 'foo(&[2])': &[i32]
329 [116; 120) '&[2]': &[i32; _] 329 116..120 '&[2]': &[i32; _]
330 [117; 120) '[2]': [i32; _] 330 117..120 '[2]': [i32; _]
331 [118; 119) '2': i32 331 118..119 '2': i32
332 [131; 132) '_': i32 332 131..132 '_': i32
333 [136; 140) '&[3]': &[i32; _] 333 136..140 '&[3]': &[i32; _]
334 [137; 140) '[3]': [i32; _] 334 137..140 '[3]': [i32; _]
335 [138; 139) '3': i32 335 138..139 '3': i32
336 "### 336 "###
337 ); 337 );
338} 338}
@@ -353,24 +353,24 @@ fn test() {
353} 353}
354"#), 354"#),
355 @r###" 355 @r###"
356 [11; 145) '{ ... }; }': () 356 11..145 '{ ... }; }': ()
357 [21; 22) 't': &mut i32 357 21..22 't': &mut i32
358 [25; 31) '&mut 1': &mut i32 358 25..31 '&mut 1': &mut i32
359 [30; 31) '1': i32 359 30..31 '1': i32
360 [41; 42) 'x': *const i32 360 41..42 'x': *const i32
361 [45; 142) 'match ... }': *const i32 361 45..142 'match ... }': *const i32
362 [51; 52) '1': i32 362 51..52 '1': i32
363 [63; 64) '1': i32 363 63..64 '1': i32
364 [63; 64) '1': i32 364 63..64 '1': i32
365 [68; 69) 't': &mut i32 365 68..69 't': &mut i32
366 [68; 81) 't as *mut i32': *mut i32 366 68..81 't as *mut i32': *mut i32
367 [91; 92) '2': i32 367 91..92 '2': i32
368 [91; 92) '2': i32 368 91..92 '2': i32
369 [96; 97) 't': &mut i32 369 96..97 't': &mut i32
370 [96; 105) 't as &i32': &i32 370 96..105 't as &i32': &i32
371 [115; 116) '_': i32 371 115..116 '_': i32
372 [120; 121) 't': &mut i32 372 120..121 't': &mut i32
373 [120; 135) 't as *const i32': *const i32 373 120..135 't as *const i32': *const i32
374 "### 374 "###
375 ); 375 );
376} 376}
@@ -384,9 +384,9 @@ fn foo() -> u32 {
384} 384}
385"#, true), 385"#, true),
386 @r###" 386 @r###"
387 [17; 40) '{ ...own; }': ! 387 17..40 '{ ...own; }': !
388 [23; 37) 'return unknown': ! 388 23..37 'return unknown': !
389 [30; 37) 'unknown': u32 389 30..37 'unknown': u32
390 "### 390 "###
391 ); 391 );
392} 392}
@@ -404,24 +404,24 @@ fn test() {
404} 404}
405"#, true), 405"#, true),
406 @r###" 406 @r###"
407 [30; 31) 'x': &Foo 407 30..31 'x': &Foo
408 [39; 41) '{}': () 408 39..41 '{}': ()
409 [52; 133) '{ ...oo); }': () 409 52..133 '{ ...oo); }': ()
410 [58; 71) 'takes_ref_foo': fn takes_ref_foo(&Foo) 410 58..71 'takes_ref_foo': fn takes_ref_foo(&Foo)
411 [58; 77) 'takes_...(&Foo)': () 411 58..77 'takes_...(&Foo)': ()
412 [72; 76) '&Foo': &Foo 412 72..76 '&Foo': &Foo
413 [73; 76) 'Foo': Foo 413 73..76 'Foo': Foo
414 [83; 96) 'takes_ref_foo': fn takes_ref_foo(&Foo) 414 83..96 'takes_ref_foo': fn takes_ref_foo(&Foo)
415 [83; 103) 'takes_...&&Foo)': () 415 83..103 'takes_...&&Foo)': ()
416 [97; 102) '&&Foo': &&Foo 416 97..102 '&&Foo': &&Foo
417 [98; 102) '&Foo': &Foo 417 98..102 '&Foo': &Foo
418 [99; 102) 'Foo': Foo 418 99..102 'Foo': Foo
419 [109; 122) 'takes_ref_foo': fn takes_ref_foo(&Foo) 419 109..122 'takes_ref_foo': fn takes_ref_foo(&Foo)
420 [109; 130) 'takes_...&&Foo)': () 420 109..130 'takes_...&&Foo)': ()
421 [123; 129) '&&&Foo': &&&Foo 421 123..129 '&&&Foo': &&&Foo
422 [124; 129) '&&Foo': &&Foo 422 124..129 '&&Foo': &&Foo
423 [125; 129) '&Foo': &Foo 423 125..129 '&Foo': &Foo
424 [126; 129) 'Foo': Foo 424 126..129 'Foo': Foo
425 "### 425 "###
426 ); 426 );
427} 427}
@@ -439,26 +439,26 @@ fn test() {
439} 439}
440"#, true), 440"#, true),
441 @r###" 441 @r###"
442 [29; 30) 'x': &T 442 29..30 'x': &T
443 [41; 47) '{ *x }': T 443 41..47 '{ *x }': T
444 [43; 45) '*x': T 444 43..45 '*x': T
445 [44; 45) 'x': &T 445 44..45 'x': &T
446 [58; 127) '{ ...oo); }': () 446 58..127 '{ ...oo); }': ()
447 [64; 73) 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo 447 64..73 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
448 [64; 79) 'takes_ref(&Foo)': Foo 448 64..79 'takes_ref(&Foo)': Foo
449 [74; 78) '&Foo': &Foo 449 74..78 '&Foo': &Foo
450 [75; 78) 'Foo': Foo 450 75..78 'Foo': Foo
451 [85; 94) 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo 451 85..94 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
452 [85; 101) 'takes_...&&Foo)': &Foo 452 85..101 'takes_...&&Foo)': &Foo
453 [95; 100) '&&Foo': &&Foo 453 95..100 '&&Foo': &&Foo
454 [96; 100) '&Foo': &Foo 454 96..100 '&Foo': &Foo
455 [97; 100) 'Foo': Foo 455 97..100 'Foo': Foo
456 [107; 116) 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo 456 107..116 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
457 [107; 124) 'takes_...&&Foo)': &&Foo 457 107..124 'takes_...&&Foo)': &&Foo
458 [117; 123) '&&&Foo': &&&Foo 458 117..123 '&&&Foo': &&&Foo
459 [118; 123) '&&Foo': &&Foo 459 118..123 '&&Foo': &&Foo
460 [119; 123) '&Foo': &Foo 460 119..123 '&Foo': &Foo
461 [120; 123) 'Foo': Foo 461 120..123 'Foo': Foo
462 "### 462 "###
463 ); 463 );
464} 464}
@@ -478,18 +478,18 @@ fn test() {
478} 478}
479"#, true), 479"#, true),
480 @r###" 480 @r###"
481 [127; 128) 'x': &str 481 127..128 'x': &str
482 [136; 138) '{}': () 482 136..138 '{}': ()
483 [169; 180) '{ loop {} }': String 483 169..180 '{ loop {} }': String
484 [171; 178) 'loop {}': ! 484 171..178 'loop {}': !
485 [176; 178) '{}': () 485 176..178 '{}': ()
486 [191; 236) '{ ... }); }': () 486 191..236 '{ ... }); }': ()
487 [197; 210) 'takes_ref_str': fn takes_ref_str(&str) 487 197..210 'takes_ref_str': fn takes_ref_str(&str)
488 [197; 233) 'takes_...g() })': () 488 197..233 'takes_...g() })': ()
489 [211; 232) '&{ ret...ng() }': &String 489 211..232 '&{ ret...ng() }': &String
490 [212; 232) '{ retu...ng() }': String 490 212..232 '{ retu...ng() }': String
491 [214; 228) 'returns_string': fn returns_string() -> String 491 214..228 'returns_string': fn returns_string() -> String
492 [214; 230) 'return...ring()': String 492 214..230 'return...ring()': String
493 "### 493 "###
494 ); 494 );
495} 495}
@@ -508,19 +508,19 @@ fn foo() {
508} 508}
509"#, true), 509"#, true),
510 @r###" 510 @r###"
511 [10; 106) '{ ... }; }': () 511 10..106 '{ ... }; }': ()
512 [20; 21) 'x': || -> &u32 512 20..21 'x': || -> &u32
513 [24; 103) '|| { ... }': || -> &u32 513 24..103 '|| { ... }': || -> &u32
514 [27; 103) '{ ... }': &u32 514 27..103 '{ ... }': &u32
515 [37; 82) 'if tru... }': () 515 37..82 'if tru... }': ()
516 [40; 44) 'true': bool 516 40..44 'true': bool
517 [45; 82) '{ ... }': ! 517 45..82 '{ ... }': !
518 [59; 71) 'return &1u32': ! 518 59..71 'return &1u32': !
519 [66; 71) '&1u32': &u32 519 66..71 '&1u32': &u32
520 [67; 71) '1u32': u32 520 67..71 '1u32': u32
521 [91; 97) '&&1u32': &&u32 521 91..97 '&&1u32': &&u32
522 [92; 97) '&1u32': &u32 522 92..97 '&1u32': &u32
523 [93; 97) '1u32': u32 523 93..97 '1u32': u32
524 "### 524 "###
525 ); 525 );
526} 526}
@@ -535,12 +535,12 @@ fn test() {
535} 535}
536"#, true), 536"#, true),
537 @r###" 537 @r###"
538 [8; 9) 'x': u32 538 8..9 'x': u32
539 [25; 30) '{ 1 }': isize 539 25..30 '{ 1 }': isize
540 [27; 28) '1': isize 540 27..28 '1': isize
541 [41; 79) '{ ...foo; }': () 541 41..79 '{ ...foo; }': ()
542 [51; 52) 'f': fn(u32) -> isize 542 51..52 'f': fn(u32) -> isize
543 [73; 76) 'foo': fn foo(u32) -> isize 543 73..76 'foo': fn foo(u32) -> isize
544 "### 544 "###
545 ); 545 );
546} 546}
@@ -554,12 +554,12 @@ fn test() {
554} 554}
555"#, true), 555"#, true),
556 @r###" 556 @r###"
557 [11; 55) '{ ...1 }; }': () 557 11..55 '{ ...1 }; }': ()
558 [21; 22) 'f': fn(u32) -> isize 558 21..22 'f': fn(u32) -> isize
559 [43; 52) '|x| { 1 }': |u32| -> isize 559 43..52 '|x| { 1 }': |u32| -> isize
560 [44; 45) 'x': u32 560 44..45 'x': u32
561 [47; 52) '{ 1 }': isize 561 47..52 '{ 1 }': isize
562 [49; 50) '1': isize 562 49..50 '1': isize
563 "### 563 "###
564 ); 564 );
565} 565}
@@ -577,11 +577,11 @@ impl<TT> S<TT> {
577} 577}
578"#, true), 578"#, true),
579 @r###" 579 @r###"
580 [51; 55) 'self': &S<TT> 580 51..55 'self': &S<TT>
581 [64; 87) '{ ... }': &TT 581 64..87 '{ ... }': &TT
582 [74; 81) '&self.t': &TT 582 74..81 '&self.t': &TT
583 [75; 79) 'self': &S<TT> 583 75..79 'self': &S<TT>
584 [75; 81) 'self.t': TT 584 75..81 'self.t': TT
585 "### 585 "###
586 ); 586 );
587} 587}
@@ -602,13 +602,13 @@ fn test() {
602} 602}
603"#, true), 603"#, true),
604 @r###" 604 @r###"
605 [162; 199) '{ ... 3]; }': () 605 162..199 '{ ... 3]; }': ()
606 [172; 173) 'f': &[usize] 606 172..173 'f': &[usize]
607 [186; 196) '&[1, 2, 3]': &[usize; _] 607 186..196 '&[1, 2, 3]': &[usize; _]
608 [187; 196) '[1, 2, 3]': [usize; _] 608 187..196 '[1, 2, 3]': [usize; _]
609 [188; 189) '1': usize 609 188..189 '1': usize
610 [191; 192) '2': usize 610 191..192 '2': usize
611 [194; 195) '3': usize 611 194..195 '3': usize
612 "### 612 "###
613 ); 613 );
614} 614}
@@ -642,19 +642,19 @@ fn test() {
642} 642}
643"#, true), 643"#, true),
644 @r###" 644 @r###"
645 [388; 573) '{ ...bj2; }': () 645 388..573 '{ ...bj2; }': ()
646 [398; 401) 'obj': &dyn Baz<i8, i16> 646 398..401 'obj': &dyn Baz<i8, i16>
647 [423; 425) '&S': &S<i8, i16> 647 423..425 '&S': &S<i8, i16>
648 [424; 425) 'S': S<i8, i16> 648 424..425 'S': S<i8, i16>
649 [435; 438) 'obj': &dyn Bar<usize, i8, i16> 649 435..438 'obj': &dyn Bar<usize, i8, i16>
650 [460; 463) 'obj': &dyn Baz<i8, i16> 650 460..463 'obj': &dyn Baz<i8, i16>
651 [473; 476) 'obj': &dyn Foo<i8, usize> 651 473..476 'obj': &dyn Foo<i8, usize>
652 [495; 498) 'obj': &dyn Bar<usize, i8, i16> 652 495..498 'obj': &dyn Bar<usize, i8, i16>
653 [508; 512) 'obj2': &dyn Baz<i8, i16> 653 508..512 'obj2': &dyn Baz<i8, i16>
654 [534; 536) '&S': &S<i8, i16> 654 534..536 '&S': &S<i8, i16>
655 [535; 536) 'S': S<i8, i16> 655 535..536 'S': S<i8, i16>
656 [546; 547) '_': &dyn Foo<i8, usize> 656 546..547 '_': &dyn Foo<i8, usize>
657 [566; 570) 'obj2': &dyn Baz<i8, i16> 657 566..570 'obj2': &dyn Baz<i8, i16>
658 "### 658 "###
659 ); 659 );
660} 660}
@@ -687,12 +687,12 @@ fn test() {
687} 687}
688"#, true), 688"#, true),
689 @r###" 689 @r###"
690 [292; 348) '{ ...obj; }': () 690 292..348 '{ ...obj; }': ()
691 [302; 305) 'obj': &dyn D 691 302..305 'obj': &dyn D
692 [316; 318) '&S': &S 692 316..318 '&S': &S
693 [317; 318) 'S': S 693 317..318 'S': S
694 [328; 331) 'obj': &dyn A 694 328..331 'obj': &dyn A
695 [342; 345) 'obj': &dyn D 695 342..345 'obj': &dyn D
696 "### 696 "###
697 ); 697 );
698} 698}
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index f2a9b1c40..6b5267232 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -67,12 +67,12 @@ fn main() {
67} 67}
68"#), 68"#),
69 @r###" 69 @r###"
70 ![0; 17) '{Foo(v...,2,])}': Foo 70 !0..17 '{Foo(v...,2,])}': Foo
71 ![1; 4) 'Foo': Foo({unknown}) -> Foo 71 !1..4 'Foo': Foo({unknown}) -> Foo
72 ![1; 16) 'Foo(vec![1,2,])': Foo 72 !1..16 'Foo(vec![1,2,])': Foo
73 ![5; 15) 'vec![1,2,]': {unknown} 73 !5..15 'vec![1,2,]': {unknown}
74 [156; 182) '{ ...,2); }': () 74 156..182 '{ ...,2); }': ()
75 [166; 167) 'x': Foo 75 166..167 'x': Foo
76 "### 76 "###
77 ); 77 );
78} 78}
@@ -100,14 +100,14 @@ fn main() {
100} 100}
101"#), 101"#),
102 @r###" 102 @r###"
103 ![0; 17) '{Foo(v...,2,])}': Foo 103 !0..17 '{Foo(v...,2,])}': Foo
104 ![1; 4) 'Foo': Foo({unknown}) -> Foo 104 !1..4 'Foo': Foo({unknown}) -> Foo
105 ![1; 16) 'Foo(vec![1,2,])': Foo 105 !1..16 'Foo(vec![1,2,])': Foo
106 ![5; 15) 'vec![1,2,]': {unknown} 106 !5..15 'vec![1,2,]': {unknown}
107 [195; 251) '{ ...,2); }': () 107 195..251 '{ ...,2); }': ()
108 [205; 206) 'x': Foo 108 205..206 'x': Foo
109 [228; 229) 'y': {unknown} 109 228..229 'y': {unknown}
110 [232; 248) 'crate:...!(1,2)': {unknown} 110 232..248 'crate:...!(1,2)': {unknown}
111 "### 111 "###
112 ); 112 );
113} 113}
@@ -131,11 +131,11 @@ fn main() {
131} 131}
132"#), 132"#),
133 @r###" 133 @r###"
134 ![0; 5) '42i32': i32 134 !0..5 '42i32': i32
135 ![0; 5) '42i32': i32 135 !0..5 '42i32': i32
136 [111; 164) '{ ...!(); }': () 136 111..164 '{ ...!(); }': ()
137 [121; 122) 'x': i32 137 121..122 'x': i32
138 [148; 149) 'y': i32 138 148..149 'y': i32
139 "### 139 "###
140 ); 140 );
141} 141}
@@ -172,51 +172,51 @@ fn spam() {
172} 172}
173"#), 173"#),
174 @r###" 174 @r###"
175 ![0; 6) '1isize': isize 175 !0..6 '1isize': isize
176 ![0; 6) '1isize': isize 176 !0..6 '1isize': isize
177 ![0; 6) '1isize': isize 177 !0..6 '1isize': isize
178 ![0; 6) '1isize': isize 178 !0..6 '1isize': isize
179 ![0; 6) '1isize': isize 179 !0..6 '1isize': isize
180 ![0; 6) '1isize': isize 180 !0..6 '1isize': isize
181 ![0; 6) '1isize': isize 181 !0..6 '1isize': isize
182 ![0; 6) '1isize': isize 182 !0..6 '1isize': isize
183 ![0; 6) '1isize': isize 183 !0..6 '1isize': isize
184 ![0; 6) '1isize': isize 184 !0..6 '1isize': isize
185 ![0; 6) '1isize': isize 185 !0..6 '1isize': isize
186 ![0; 6) '1isize': isize 186 !0..6 '1isize': isize
187 ![0; 6) '1isize': isize 187 !0..6 '1isize': isize
188 ![0; 6) '1isize': isize 188 !0..6 '1isize': isize
189 ![0; 6) '1isize': isize 189 !0..6 '1isize': isize
190 ![0; 6) '1isize': isize 190 !0..6 '1isize': isize
191 ![0; 6) '1isize': isize 191 !0..6 '1isize': isize
192 ![0; 6) '1isize': isize 192 !0..6 '1isize': isize
193 ![0; 6) '1isize': isize 193 !0..6 '1isize': isize
194 ![0; 6) '1isize': isize 194 !0..6 '1isize': isize
195 ![0; 6) '1isize': isize 195 !0..6 '1isize': isize
196 ![0; 6) '1isize': isize 196 !0..6 '1isize': isize
197 ![0; 6) '1isize': isize 197 !0..6 '1isize': isize
198 ![0; 6) '1isize': isize 198 !0..6 '1isize': isize
199 ![0; 6) '1isize': isize 199 !0..6 '1isize': isize
200 [54; 457) '{ ...!(); }': ! 200 54..457 '{ ...!(); }': !
201 [88; 109) 'spam!(...am!())': {unknown} 201 88..109 'spam!(...am!())': {unknown}
202 [115; 134) 'for _ ...!() {}': () 202 115..134 'for _ ...!() {}': ()
203 [119; 120) '_': {unknown} 203 119..120 '_': {unknown}
204 [132; 134) '{}': () 204 132..134 '{}': ()
205 [139; 149) '|| spam!()': || -> isize 205 139..149 '|| spam!()': || -> isize
206 [155; 171) 'while ...!() {}': () 206 155..171 'while ...!() {}': ()
207 [169; 171) '{}': () 207 169..171 '{}': ()
208 [176; 189) 'break spam!()': ! 208 176..189 'break spam!()': !
209 [195; 209) 'return spam!()': ! 209 195..209 'return spam!()': !
210 [215; 269) 'match ... }': isize 210 215..269 'match ... }': isize
211 [239; 240) '_': isize 211 239..240 '_': isize
212 [274; 290) 'spam!(...am!())': {unknown} 212 274..290 'spam!(...am!())': {unknown}
213 [296; 318) 'Spam {...m!() }': {unknown} 213 296..318 'Spam {...m!() }': {unknown}
214 [324; 340) 'spam!(...am!()]': {unknown} 214 324..340 'spam!(...am!()]': {unknown}
215 [365; 381) 'spam!(... usize': usize 215 365..381 'spam!(... usize': usize
216 [387; 395) '&spam!()': &isize 216 387..395 '&spam!()': &isize
217 [401; 409) '-spam!()': isize 217 401..409 '-spam!()': isize
218 [415; 431) 'spam!(...pam!()': {unknown} 218 415..431 'spam!(...pam!()': {unknown}
219 [437; 454) 'spam!(...pam!()': isize 219 437..454 'spam!(...pam!()': isize
220 "### 220 "###
221 ); 221 );
222} 222}
@@ -244,9 +244,9 @@ fn foo() {
244} 244}
245"#), 245"#),
246 @r###" 246 @r###"
247 ![0; 5) '42i32': i32 247 !0..5 '42i32': i32
248 [171; 206) '{ ...32); }': () 248 171..206 '{ ...32); }': ()
249 [181; 184) 'foo': i32 249 181..184 'foo': i32
250 "### 250 "###
251 ); 251 );
252} 252}
@@ -357,12 +357,12 @@ fn main() {
357} 357}
358"#), 358"#),
359 @r###" 359 @r###"
360 [159; 164) '{ 0 }': u64 360 159..164 '{ 0 }': u64
361 [161; 162) '0': u64 361 161..162 '0': u64
362 [175; 197) '{ ...f(); }': () 362 175..197 '{ ...f(); }': ()
363 [185; 187) '_a': u64 363 185..187 '_a': u64
364 [191; 192) 'f': fn f() -> u64 364 191..192 'f': fn f() -> u64
365 [191; 194) 'f()': u64 365 191..194 'f()': u64
366 "### 366 "###
367 ); 367 );
368} 368}
@@ -379,10 +379,10 @@ fn main() {
379} 379}
380"#), 380"#),
381 @r###" 381 @r###"
382 ![0; 6) '1usize': usize 382 !0..6 '1usize': usize
383 [11; 90) '{ ...!(); }': () 383 11..90 '{ ...!(); }': ()
384 [17; 66) 'macro_... }': {unknown} 384 17..66 'macro_... }': {unknown}
385 [75; 77) '_a': usize 385 75..77 '_a': usize
386 "### 386 "###
387 ); 387 );
388} 388}
@@ -399,9 +399,9 @@ fn main() {
399} 399}
400"#), 400"#),
401 @r###" 401 @r###"
402 ![0; 1) '0': i32 402 !0..1 '0': i32
403 [64; 88) '{ ...!(); }': () 403 64..88 '{ ...!(); }': ()
404 [74; 75) 'x': i32 404 74..75 'x': i32
405 "### 405 "###
406 ); 406 );
407} 407}
@@ -418,9 +418,9 @@ fn main() {
418} 418}
419"#), 419"#),
420 @r###" 420 @r###"
421 ![0; 2) '""': &str 421 !0..2 '""': &str
422 [64; 88) '{ ...!(); }': () 422 64..88 '{ ...!(); }': ()
423 [74; 75) 'x': &str 423 74..75 'x': &str
424 "### 424 "###
425 ); 425 );
426} 426}
@@ -437,9 +437,9 @@ fn main() {
437} 437}
438"#), 438"#),
439 @r###" 439 @r###"
440 ![0; 1) '0': i32 440 !0..1 '0': i32
441 [66; 92) '{ ...!(); }': () 441 66..92 '{ ...!(); }': ()
442 [76; 77) 'x': i32 442 76..77 'x': i32
443 "### 443 "###
444 ); 444 );
445} 445}
@@ -456,9 +456,9 @@ fn main() {
456} 456}
457"#), 457"#),
458 @r###" 458 @r###"
459 ![0; 13) '"helloworld!"': &str 459 !0..13 '"helloworld!"': &str
460 [66; 122) '{ ...")); }': () 460 66..122 '{ ...")); }': ()
461 [76; 77) 'x': &str 461 76..77 'x': &str
462 "### 462 "###
463 ); 463 );
464} 464}
@@ -591,9 +591,9 @@ fn main() {
591} 591}
592"#), 592"#),
593 @r###" 593 @r###"
594 ![0; 13) '"helloworld!"': &str 594 !0..13 '"helloworld!"': &str
595 [104; 161) '{ ...")); }': () 595 104..161 '{ ...")); }': ()
596 [114; 115) 'x': &str 596 114..115 'x': &str
597 "### 597 "###
598 ); 598 );
599} 599}
@@ -611,9 +611,9 @@ fn main() {
611} 611}
612"#), 612"#),
613 @r###" 613 @r###"
614 ![0; 5) '"bar"': &str 614 !0..5 '"bar"': &str
615 [88; 116) '{ ...o"); }': () 615 88..116 '{ ...o"); }': ()
616 [98; 99) 'x': &str 616 98..99 'x': &str
617 "### 617 "###
618 ); 618 );
619} 619}
@@ -703,12 +703,12 @@ fn main() {
703} 703}
704"#), 704"#),
705 @r###" 705 @r###"
706 [52; 111) '{ ... }; }': () 706 52..111 '{ ... }; }': ()
707 [62; 63) 'x': u32 707 62..63 'x': u32
708 [66; 108) 'match ... }': u32 708 66..108 'match ... }': u32
709 [72; 74) '()': () 709 72..74 '()': ()
710 [85; 92) 'unit!()': () 710 85..92 'unit!()': ()
711 [96; 101) '92u32': u32 711 96..101 '92u32': u32
712 "### 712 "###
713 ); 713 );
714} 714}
diff --git a/crates/ra_hir_ty/src/tests/method_resolution.rs b/crates/ra_hir_ty/src/tests/method_resolution.rs
index af3e5b12c..ab87f598a 100644
--- a/crates/ra_hir_ty/src/tests/method_resolution.rs
+++ b/crates/ra_hir_ty/src/tests/method_resolution.rs
@@ -22,14 +22,14 @@ fn test() {
22} 22}
23"#), 23"#),
24 @r###" 24 @r###"
25 [45; 49) 'self': &[T] 25 45..49 'self': &[T]
26 [56; 79) '{ ... }': T 26 56..79 '{ ... }': T
27 [66; 73) 'loop {}': ! 27 66..73 'loop {}': !
28 [71; 73) '{}': () 28 71..73 '{}': ()
29 [133; 160) '{ ...o"); }': () 29 133..160 '{ ...o"); }': ()
30 [139; 149) '<[_]>::foo': fn foo<u8>(&[u8]) -> u8 30 139..149 '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
31 [139; 157) '<[_]>:..."foo")': u8 31 139..157 '<[_]>:..."foo")': u8
32 [150; 156) 'b"foo"': &[u8] 32 150..156 'b"foo"': &[u8]
33 "### 33 "###
34 ); 34 );
35} 35}
@@ -51,15 +51,15 @@ fn test() {
51} 51}
52"#), 52"#),
53 @r###" 53 @r###"
54 [49; 75) '{ ... }': A 54 49..75 '{ ... }': A
55 [59; 69) 'A { x: 0 }': A 55 59..69 'A { x: 0 }': A
56 [66; 67) '0': u32 56 66..67 '0': u32
57 [88; 122) '{ ...a.x; }': () 57 88..122 '{ ...a.x; }': ()
58 [98; 99) 'a': A 58 98..99 'a': A
59 [102; 108) 'A::new': fn new() -> A 59 102..108 'A::new': fn new() -> A
60 [102; 110) 'A::new()': A 60 102..110 'A::new()': A
61 [116; 117) 'a': A 61 116..117 'a': A
62 [116; 119) 'a.x': u32 62 116..119 'a.x': u32
63 "### 63 "###
64 ); 64 );
65} 65}
@@ -86,19 +86,19 @@ fn test() {
86} 86}
87"#), 87"#),
88 @r###" 88 @r###"
89 [47; 67) '{ ... }': A 89 47..67 '{ ... }': A
90 [57; 61) 'A::B': A 90 57..61 'A::B': A
91 [88; 108) '{ ... }': A 91 88..108 '{ ... }': A
92 [98; 102) 'A::C': A 92 98..102 'A::C': A
93 [121; 178) '{ ... c; }': () 93 121..178 '{ ... c; }': ()
94 [131; 132) 'a': A 94 131..132 'a': A
95 [135; 139) 'A::b': fn b() -> A 95 135..139 'A::b': fn b() -> A
96 [135; 141) 'A::b()': A 96 135..141 'A::b()': A
97 [147; 148) 'a': A 97 147..148 'a': A
98 [158; 159) 'c': A 98 158..159 'c': A
99 [162; 166) 'A::c': fn c() -> A 99 162..166 'A::c': fn c() -> A
100 [162; 168) 'A::c()': A 100 162..168 'A::c()': A
101 [174; 175) 'c': A 101 174..175 'c': A
102 "### 102 "###
103 ); 103 );
104} 104}
@@ -130,22 +130,22 @@ fn test() {
130} 130}
131"#), 131"#),
132 @r###" 132 @r###"
133 [56; 64) '{ A {} }': A 133 56..64 '{ A {} }': A
134 [58; 62) 'A {}': A 134 58..62 'A {}': A
135 [126; 132) '{ 99 }': u32 135 126..132 '{ 99 }': u32
136 [128; 130) '99': u32 136 128..130 '99': u32
137 [202; 210) '{ C {} }': C 137 202..210 '{ C {} }': C
138 [204; 208) 'C {}': C 138 204..208 'C {}': C
139 [241; 325) '{ ...g(); }': () 139 241..325 '{ ...g(); }': ()
140 [251; 252) 'x': A 140 251..252 'x': A
141 [255; 266) 'a::A::thing': fn thing() -> A 141 255..266 'a::A::thing': fn thing() -> A
142 [255; 268) 'a::A::thing()': A 142 255..268 'a::A::thing()': A
143 [278; 279) 'y': u32 143 278..279 'y': u32
144 [282; 293) 'b::B::thing': fn thing() -> u32 144 282..293 'b::B::thing': fn thing() -> u32
145 [282; 295) 'b::B::thing()': u32 145 282..295 'b::B::thing()': u32
146 [305; 306) 'z': C 146 305..306 'z': C
147 [309; 320) 'c::C::thing': fn thing() -> C 147 309..320 'c::C::thing': fn thing() -> C
148 [309; 322) 'c::C::thing()': C 148 309..322 'c::C::thing()': C
149 "### 149 "###
150 ); 150 );
151} 151}
@@ -169,15 +169,15 @@ fn test() {
169} 169}
170"#), 170"#),
171 @r###" 171 @r###"
172 [64; 67) 'val': T 172 64..67 'val': T
173 [82; 109) '{ ... }': Gen<T> 173 82..109 '{ ... }': Gen<T>
174 [92; 103) 'Gen { val }': Gen<T> 174 92..103 'Gen { val }': Gen<T>
175 [98; 101) 'val': T 175 98..101 'val': T
176 [123; 155) '{ ...32); }': () 176 123..155 '{ ...32); }': ()
177 [133; 134) 'a': Gen<u32> 177 133..134 'a': Gen<u32>
178 [137; 146) 'Gen::make': fn make<u32>(u32) -> Gen<u32> 178 137..146 'Gen::make': fn make<u32>(u32) -> Gen<u32>
179 [137; 152) 'Gen::make(0u32)': Gen<u32> 179 137..152 'Gen::make(0u32)': Gen<u32>
180 [147; 151) '0u32': u32 180 147..151 '0u32': u32
181 "### 181 "###
182 ); 182 );
183} 183}
@@ -201,13 +201,13 @@ fn test() {
201} 201}
202"#), 202"#),
203 @r###" 203 @r###"
204 [80; 104) '{ ... }': Gen<T> 204 80..104 '{ ... }': Gen<T>
205 [90; 98) 'loop { }': ! 205 90..98 'loop { }': !
206 [95; 98) '{ }': () 206 95..98 '{ }': ()
207 [118; 146) '{ ...e(); }': () 207 118..146 '{ ...e(); }': ()
208 [128; 129) 'a': Gen<u32> 208 128..129 'a': Gen<u32>
209 [132; 141) 'Gen::make': fn make<u32>() -> Gen<u32> 209 132..141 'Gen::make': fn make<u32>() -> Gen<u32>
210 [132; 143) 'Gen::make()': Gen<u32> 210 132..143 'Gen::make()': Gen<u32>
211 "### 211 "###
212 ); 212 );
213} 213}
@@ -255,13 +255,13 @@ fn test() {
255} 255}
256"#), 256"#),
257 @r###" 257 @r###"
258 [76; 100) '{ ... }': Gen<T> 258 76..100 '{ ... }': Gen<T>
259 [86; 94) 'loop { }': ! 259 86..94 'loop { }': !
260 [91; 94) '{ }': () 260 91..94 '{ }': ()
261 [114; 149) '{ ...e(); }': () 261 114..149 '{ ...e(); }': ()
262 [124; 125) 'a': Gen<u32> 262 124..125 'a': Gen<u32>
263 [128; 144) 'Gen::<...::make': fn make<u32>() -> Gen<u32> 263 128..144 'Gen::<...::make': fn make<u32>() -> Gen<u32>
264 [128; 146) 'Gen::<...make()': Gen<u32> 264 128..146 'Gen::<...make()': Gen<u32>
265 "### 265 "###
266 ); 266 );
267} 267}
@@ -286,13 +286,13 @@ fn test() {
286} 286}
287"#), 287"#),
288 @r###" 288 @r###"
289 [102; 126) '{ ... }': Gen<u32, T> 289 102..126 '{ ... }': Gen<u32, T>
290 [112; 120) 'loop { }': ! 290 112..120 'loop { }': !
291 [117; 120) '{ }': () 291 117..120 '{ }': ()
292 [140; 180) '{ ...e(); }': () 292 140..180 '{ ...e(); }': ()
293 [150; 151) 'a': Gen<u32, u64> 293 150..151 'a': Gen<u32, u64>
294 [154; 175) 'Gen::<...::make': fn make<u64>() -> Gen<u32, u64> 294 154..175 'Gen::<...::make': fn make<u64>() -> Gen<u32, u64>
295 [154; 177) 'Gen::<...make()': Gen<u32, u64> 295 154..177 'Gen::<...make()': Gen<u32, u64>
296 "### 296 "###
297 ); 297 );
298} 298}
@@ -340,13 +340,13 @@ fn test() {
340} 340}
341"#), 341"#),
342 @r###" 342 @r###"
343 [31; 35) 'self': &Self 343 31..35 'self': &Self
344 [110; 114) 'self': &Self 344 110..114 'self': &Self
345 [170; 228) '{ ...i128 }': () 345 170..228 '{ ...i128 }': ()
346 [176; 178) 'S1': S1 346 176..178 'S1': S1
347 [176; 187) 'S1.method()': u32 347 176..187 'S1.method()': u32
348 [203; 205) 'S2': S2 348 203..205 'S2': S2
349 [203; 214) 'S2.method()': i128 349 203..214 'S2.method()': i128
350 "### 350 "###
351 ); 351 );
352} 352}
@@ -387,14 +387,14 @@ mod bar_test {
387} 387}
388"#), 388"#),
389 @r###" 389 @r###"
390 [63; 67) 'self': &Self 390 63..67 'self': &Self
391 [169; 173) 'self': &Self 391 169..173 'self': &Self
392 [300; 337) '{ ... }': () 392 300..337 '{ ... }': ()
393 [310; 311) 'S': S 393 310..311 'S': S
394 [310; 320) 'S.method()': u32 394 310..320 'S.method()': u32
395 [416; 454) '{ ... }': () 395 416..454 '{ ... }': ()
396 [426; 427) 'S': S 396 426..427 'S': S
397 [426; 436) 'S.method()': i128 397 426..436 'S.method()': i128
398 "### 398 "###
399 ); 399 );
400} 400}
@@ -414,10 +414,10 @@ fn test() {
414} 414}
415"#), 415"#),
416 @r###" 416 @r###"
417 [33; 37) 'self': &Self 417 33..37 'self': &Self
418 [92; 111) '{ ...d(); }': () 418 92..111 '{ ...d(); }': ()
419 [98; 99) 'S': S 419 98..99 'S': S
420 [98; 108) 'S.method()': u32 420 98..108 'S.method()': u32
421 "### 421 "###
422 ); 422 );
423} 423}
@@ -443,17 +443,17 @@ fn test() {
443} 443}
444"#), 444"#),
445 @r###" 445 @r###"
446 [43; 47) 'self': &Self 446 43..47 'self': &Self
447 [82; 86) 'self': &Self 447 82..86 'self': &Self
448 [210; 361) '{ ..., i8 }': () 448 210..361 '{ ..., i8 }': ()
449 [216; 218) 'S1': S1 449 216..218 'S1': S1
450 [216; 228) 'S1.method1()': (u8, u16, u32) 450 216..228 'S1.method1()': (u8, u16, u32)
451 [250; 252) 'S1': S1 451 250..252 'S1': S1
452 [250; 262) 'S1.method2()': (u32, u16, u8) 452 250..262 'S1.method2()': (u32, u16, u8)
453 [284; 286) 'S2': S2 453 284..286 'S2': S2
454 [284; 296) 'S2.method1()': (i8, i16, {unknown}) 454 284..296 'S2.method1()': (i8, i16, {unknown})
455 [324; 326) 'S2': S2 455 324..326 'S2': S2
456 [324; 336) 'S2.method2()': ({unknown}, i16, i8) 456 324..336 'S2.method2()': ({unknown}, i16, i8)
457 "### 457 "###
458 ); 458 );
459} 459}
@@ -473,12 +473,12 @@ fn test() {
473} 473}
474"#), 474"#),
475 @r###" 475 @r###"
476 [33; 37) 'self': &Self 476 33..37 'self': &Self
477 [102; 127) '{ ...d(); }': () 477 102..127 '{ ...d(); }': ()
478 [108; 109) 'S': S<u32>(u32) -> S<u32> 478 108..109 'S': S<u32>(u32) -> S<u32>
479 [108; 115) 'S(1u32)': S<u32> 479 108..115 'S(1u32)': S<u32>
480 [108; 124) 'S(1u32...thod()': u32 480 108..124 'S(1u32...thod()': u32
481 [110; 114) '1u32': u32 481 110..114 '1u32': u32
482 "### 482 "###
483 ); 483 );
484} 484}
@@ -499,16 +499,16 @@ fn test() {
499} 499}
500"#), 500"#),
501 @r###" 501 @r###"
502 [87; 193) '{ ...t(); }': () 502 87..193 '{ ...t(); }': ()
503 [97; 99) 's1': S 503 97..99 's1': S
504 [105; 121) 'Defaul...efault': fn default<S>() -> S 504 105..121 'Defaul...efault': fn default<S>() -> S
505 [105; 123) 'Defaul...ault()': S 505 105..123 'Defaul...ault()': S
506 [133; 135) 's2': S 506 133..135 's2': S
507 [138; 148) 'S::default': fn default<S>() -> S 507 138..148 'S::default': fn default<S>() -> S
508 [138; 150) 'S::default()': S 508 138..150 'S::default()': S
509 [160; 162) 's3': S 509 160..162 's3': S
510 [165; 188) '<S as ...efault': fn default<S>() -> S 510 165..188 '<S as ...efault': fn default<S>() -> S
511 [165; 190) '<S as ...ault()': S 511 165..190 '<S as ...ault()': S
512 "### 512 "###
513 ); 513 );
514} 514}
@@ -531,16 +531,16 @@ fn test() {
531} 531}
532"#), 532"#),
533 @r###" 533 @r###"
534 [127; 211) '{ ...e(); }': () 534 127..211 '{ ...e(); }': ()
535 [137; 138) 'a': u32 535 137..138 'a': u32
536 [141; 148) 'S::make': fn make<S, u32>() -> u32 536 141..148 'S::make': fn make<S, u32>() -> u32
537 [141; 150) 'S::make()': u32 537 141..150 'S::make()': u32
538 [160; 161) 'b': u64 538 160..161 'b': u64
539 [164; 178) 'G::<u64>::make': fn make<G<u64>, u64>() -> u64 539 164..178 'G::<u64>::make': fn make<G<u64>, u64>() -> u64
540 [164; 180) 'G::<u6...make()': u64 540 164..180 'G::<u6...make()': u64
541 [190; 191) 'c': f64 541 190..191 'c': f64
542 [199; 206) 'G::make': fn make<G<f64>, f64>() -> f64 542 199..206 'G::make': fn make<G<f64>, f64>() -> f64
543 [199; 208) 'G::make()': f64 543 199..208 'G::make()': f64
544 "### 544 "###
545 ); 545 );
546} 546}
@@ -565,22 +565,22 @@ fn test() {
565} 565}
566"#), 566"#),
567 @r###" 567 @r###"
568 [135; 313) '{ ...e(); }': () 568 135..313 '{ ...e(); }': ()
569 [145; 146) 'a': (u32, i64) 569 145..146 'a': (u32, i64)
570 [149; 163) 'S::make::<i64>': fn make<S, u32, i64>() -> (u32, i64) 570 149..163 'S::make::<i64>': fn make<S, u32, i64>() -> (u32, i64)
571 [149; 165) 'S::mak...i64>()': (u32, i64) 571 149..165 'S::mak...i64>()': (u32, i64)
572 [175; 176) 'b': (u32, i64) 572 175..176 'b': (u32, i64)
573 [189; 196) 'S::make': fn make<S, u32, i64>() -> (u32, i64) 573 189..196 'S::make': fn make<S, u32, i64>() -> (u32, i64)
574 [189; 198) 'S::make()': (u32, i64) 574 189..198 'S::make()': (u32, i64)
575 [208; 209) 'c': (u32, i64) 575 208..209 'c': (u32, i64)
576 [212; 233) 'G::<u3...:<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64) 576 212..233 'G::<u3...:<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
577 [212; 235) 'G::<u3...i64>()': (u32, i64) 577 212..235 'G::<u3...i64>()': (u32, i64)
578 [245; 246) 'd': (u32, i64) 578 245..246 'd': (u32, i64)
579 [259; 273) 'G::make::<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64) 579 259..273 'G::make::<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
580 [259; 275) 'G::mak...i64>()': (u32, i64) 580 259..275 'G::mak...i64>()': (u32, i64)
581 [285; 286) 'e': (u32, i64) 581 285..286 'e': (u32, i64)
582 [301; 308) 'G::make': fn make<G<u32>, u32, i64>() -> (u32, i64) 582 301..308 'G::make': fn make<G<u32>, u32, i64>() -> (u32, i64)
583 [301; 310) 'G::make()': (u32, i64) 583 301..310 'G::make()': (u32, i64)
584 "### 584 "###
585 ); 585 );
586} 586}
@@ -599,10 +599,10 @@ fn test() {
599} 599}
600"#), 600"#),
601 @r###" 601 @r###"
602 [101; 127) '{ ...e(); }': () 602 101..127 '{ ...e(); }': ()
603 [111; 112) 'a': (S<i32>, i64) 603 111..112 'a': (S<i32>, i64)
604 [115; 122) 'S::make': fn make<S<i32>, i64>() -> (S<i32>, i64) 604 115..122 'S::make': fn make<S<i32>, i64>() -> (S<i32>, i64)
605 [115; 124) 'S::make()': (S<i32>, i64) 605 115..124 'S::make()': (S<i32>, i64)
606 "### 606 "###
607 ); 607 );
608} 608}
@@ -623,13 +623,13 @@ fn test() {
623} 623}
624"#), 624"#),
625 @r###" 625 @r###"
626 [131; 203) '{ ...e(); }': () 626 131..203 '{ ...e(); }': ()
627 [141; 142) 'a': (S<u64>, i64) 627 141..142 'a': (S<u64>, i64)
628 [158; 165) 'S::make': fn make<S<u64>, i64>() -> (S<u64>, i64) 628 158..165 'S::make': fn make<S<u64>, i64>() -> (S<u64>, i64)
629 [158; 167) 'S::make()': (S<u64>, i64) 629 158..167 'S::make()': (S<u64>, i64)
630 [177; 178) 'b': (S<u32>, i32) 630 177..178 'b': (S<u32>, i32)
631 [191; 198) 'S::make': fn make<S<u32>, i32>() -> (S<u32>, i32) 631 191..198 'S::make': fn make<S<u32>, i32>() -> (S<u32>, i32)
632 [191; 200) 'S::make()': (S<u32>, i32) 632 191..200 'S::make()': (S<u32>, i32)
633 "### 633 "###
634 ); 634 );
635} 635}
@@ -649,13 +649,13 @@ fn test() {
649} 649}
650"#), 650"#),
651 @r###" 651 @r###"
652 [107; 211) '{ ...>(); }': () 652 107..211 '{ ...>(); }': ()
653 [117; 118) 'a': (S<u64>, i64, u8) 653 117..118 'a': (S<u64>, i64, u8)
654 [121; 150) '<S as ...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8) 654 121..150 '<S as ...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
655 [121; 152) '<S as ...<u8>()': (S<u64>, i64, u8) 655 121..152 '<S as ...<u8>()': (S<u64>, i64, u8)
656 [162; 163) 'b': (S<u64>, i64, u8) 656 162..163 'b': (S<u64>, i64, u8)
657 [182; 206) 'Trait:...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8) 657 182..206 'Trait:...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
658 [182; 208) 'Trait:...<u8>()': (S<u64>, i64, u8) 658 182..208 'Trait:...<u8>()': (S<u64>, i64, u8)
659 "### 659 "###
660 ); 660 );
661} 661}
@@ -672,11 +672,11 @@ fn test<T: Trait>(t: T) {
672} 672}
673"#), 673"#),
674 @r###" 674 @r###"
675 [30; 34) 'self': &Self 675 30..34 'self': &Self
676 [64; 65) 't': T 676 64..65 't': T
677 [70; 89) '{ ...d(); }': () 677 70..89 '{ ...d(); }': ()
678 [76; 77) 't': T 678 76..77 't': T
679 [76; 86) 't.method()': u32 679 76..86 't.method()': u32
680 "### 680 "###
681 ); 681 );
682} 682}
@@ -693,11 +693,11 @@ fn test<U, T: Trait<U>>(t: T) {
693} 693}
694"#), 694"#),
695 @r###" 695 @r###"
696 [33; 37) 'self': &Self 696 33..37 'self': &Self
697 [71; 72) 't': T 697 71..72 't': T
698 [77; 96) '{ ...d(); }': () 698 77..96 '{ ...d(); }': ()
699 [83; 84) 't': T 699 83..84 't': T
700 [83; 93) 't.method()': U 700 83..93 't.method()': U
701 "### 701 "###
702 ); 702 );
703} 703}
@@ -719,18 +719,18 @@ fn test() {
719} 719}
720"#), 720"#),
721 @r###" 721 @r###"
722 [29; 33) 'self': Self 722 29..33 'self': Self
723 [111; 202) '{ ...(S); }': () 723 111..202 '{ ...(S); }': ()
724 [121; 122) 'x': u32 724 121..122 'x': u32
725 [130; 131) 'S': S 725 130..131 'S': S
726 [130; 138) 'S.into()': u32 726 130..138 'S.into()': u32
727 [148; 149) 'y': u64 727 148..149 'y': u64
728 [157; 158) 'S': S 728 157..158 'S': S
729 [157; 165) 'S.into()': u64 729 157..165 'S.into()': u64
730 [175; 176) 'z': u64 730 175..176 'z': u64
731 [179; 196) 'Into::...::into': fn into<S, u64>(S) -> u64 731 179..196 'Into::...::into': fn into<S, u64>(S) -> u64
732 [179; 199) 'Into::...nto(S)': u64 732 179..199 'Into::...nto(S)': u64
733 [197; 198) 'S': S 733 197..198 'S': S
734 "### 734 "###
735 ); 735 );
736} 736}
diff --git a/crates/ra_hir_ty/src/tests/patterns.rs b/crates/ra_hir_ty/src/tests/patterns.rs
index 6ea51d5d3..af291092d 100644
--- a/crates/ra_hir_ty/src/tests/patterns.rs
+++ b/crates/ra_hir_ty/src/tests/patterns.rs
@@ -30,54 +30,54 @@ fn test(x: &i32) {
30} 30}
31"#), 31"#),
32 @r###" 32 @r###"
33 [9; 10) 'x': &i32 33 9..10 'x': &i32
34 [18; 369) '{ ...o_x; }': () 34 18..369 '{ ...o_x; }': ()
35 [28; 29) 'y': &i32 35 28..29 'y': &i32
36 [32; 33) 'x': &i32 36 32..33 'x': &i32
37 [43; 45) '&z': &i32 37 43..45 '&z': &i32
38 [44; 45) 'z': i32 38 44..45 'z': i32
39 [48; 49) 'x': &i32 39 48..49 'x': &i32
40 [59; 60) 'a': i32 40 59..60 'a': i32
41 [63; 64) 'z': i32 41 63..64 'z': i32
42 [74; 80) '(c, d)': (i32, &str) 42 74..80 '(c, d)': (i32, &str)
43 [75; 76) 'c': i32 43 75..76 'c': i32
44 [78; 79) 'd': &str 44 78..79 'd': &str
45 [83; 95) '(1, "hello")': (i32, &str) 45 83..95 '(1, "hello")': (i32, &str)
46 [84; 85) '1': i32 46 84..85 '1': i32
47 [87; 94) '"hello"': &str 47 87..94 '"hello"': &str
48 [102; 152) 'for (e... }': () 48 102..152 'for (e... }': ()
49 [106; 112) '(e, f)': ({unknown}, {unknown}) 49 106..112 '(e, f)': ({unknown}, {unknown})
50 [107; 108) 'e': {unknown} 50 107..108 'e': {unknown}
51 [110; 111) 'f': {unknown} 51 110..111 'f': {unknown}
52 [116; 125) 'some_iter': {unknown} 52 116..125 'some_iter': {unknown}
53 [126; 152) '{ ... }': () 53 126..152 '{ ... }': ()
54 [140; 141) 'g': {unknown} 54 140..141 'g': {unknown}
55 [144; 145) 'e': {unknown} 55 144..145 'e': {unknown}
56 [158; 205) 'if let... }': () 56 158..205 'if let... }': ()
57 [165; 170) '[val]': [{unknown}] 57 165..170 '[val]': [{unknown}]
58 [166; 169) 'val': {unknown} 58 166..169 'val': {unknown}
59 [173; 176) 'opt': [{unknown}] 59 173..176 'opt': [{unknown}]
60 [177; 205) '{ ... }': () 60 177..205 '{ ... }': ()
61 [191; 192) 'h': {unknown} 61 191..192 'h': {unknown}
62 [195; 198) 'val': {unknown} 62 195..198 'val': {unknown}
63 [215; 221) 'lambda': |u64, u64, i32| -> i32 63 215..221 'lambda': |u64, u64, i32| -> i32
64 [224; 256) '|a: u6...b; c }': |u64, u64, i32| -> i32 64 224..256 '|a: u6...b; c }': |u64, u64, i32| -> i32
65 [225; 226) 'a': u64 65 225..226 'a': u64
66 [233; 234) 'b': u64 66 233..234 'b': u64
67 [236; 237) 'c': i32 67 236..237 'c': i32
68 [244; 256) '{ a + b; c }': i32 68 244..256 '{ a + b; c }': i32
69 [246; 247) 'a': u64 69 246..247 'a': u64
70 [246; 251) 'a + b': u64 70 246..251 'a + b': u64
71 [250; 251) 'b': u64 71 250..251 'b': u64
72 [253; 254) 'c': i32 72 253..254 'c': i32
73 [267; 279) 'ref ref_to_x': &&i32 73 267..279 'ref ref_to_x': &&i32
74 [282; 283) 'x': &i32 74 282..283 'x': &i32
75 [293; 302) 'mut mut_x': &i32 75 293..302 'mut mut_x': &i32
76 [305; 306) 'x': &i32 76 305..306 'x': &i32
77 [316; 336) 'ref mu...f_to_x': &mut &i32 77 316..336 'ref mu...f_to_x': &mut &i32
78 [339; 340) 'x': &i32 78 339..340 'x': &i32
79 [350; 351) 'k': &mut &i32 79 350..351 'k': &mut &i32
80 [354; 366) 'mut_ref_to_x': &mut &i32 80 354..366 'mut_ref_to_x': &mut &i32
81 "### 81 "###
82 ); 82 );
83} 83}
@@ -97,47 +97,47 @@ fn test(x: &i32) {
97} 97}
98"#, true), 98"#, true),
99 @r###" 99 @r###"
100 [18; 29) '{ loop {} }': T 100 18..29 '{ loop {} }': T
101 [20; 27) 'loop {}': ! 101 20..27 'loop {}': !
102 [25; 27) '{}': () 102 25..27 '{}': ()
103 [38; 39) 'x': &i32 103 38..39 'x': &i32
104 [47; 209) '{ ...) {} }': () 104 47..209 '{ ...) {} }': ()
105 [53; 76) 'if let...y() {}': () 105 53..76 'if let...y() {}': ()
106 [60; 65) '"foo"': &str 106 60..65 '"foo"': &str
107 [60; 65) '"foo"': &str 107 60..65 '"foo"': &str
108 [68; 71) 'any': fn any<&str>() -> &str 108 68..71 'any': fn any<&str>() -> &str
109 [68; 73) 'any()': &str 109 68..73 'any()': &str
110 [74; 76) '{}': () 110 74..76 '{}': ()
111 [81; 100) 'if let...y() {}': () 111 81..100 'if let...y() {}': ()
112 [88; 89) '1': i32 112 88..89 '1': i32
113 [88; 89) '1': i32 113 88..89 '1': i32
114 [92; 95) 'any': fn any<i32>() -> i32 114 92..95 'any': fn any<i32>() -> i32
115 [92; 97) 'any()': i32 115 92..97 'any()': i32
116 [98; 100) '{}': () 116 98..100 '{}': ()
117 [105; 127) 'if let...y() {}': () 117 105..127 'if let...y() {}': ()
118 [112; 116) '1u32': u32 118 112..116 '1u32': u32
119 [112; 116) '1u32': u32 119 112..116 '1u32': u32
120 [119; 122) 'any': fn any<u32>() -> u32 120 119..122 'any': fn any<u32>() -> u32
121 [119; 124) 'any()': u32 121 119..124 'any()': u32
122 [125; 127) '{}': () 122 125..127 '{}': ()
123 [132; 154) 'if let...y() {}': () 123 132..154 'if let...y() {}': ()
124 [139; 143) '1f32': f32 124 139..143 '1f32': f32
125 [139; 143) '1f32': f32 125 139..143 '1f32': f32
126 [146; 149) 'any': fn any<f32>() -> f32 126 146..149 'any': fn any<f32>() -> f32
127 [146; 151) 'any()': f32 127 146..151 'any()': f32
128 [152; 154) '{}': () 128 152..154 '{}': ()
129 [159; 180) 'if let...y() {}': () 129 159..180 'if let...y() {}': ()
130 [166; 169) '1.0': f64 130 166..169 '1.0': f64
131 [166; 169) '1.0': f64 131 166..169 '1.0': f64
132 [172; 175) 'any': fn any<f64>() -> f64 132 172..175 'any': fn any<f64>() -> f64
133 [172; 177) 'any()': f64 133 172..177 'any()': f64
134 [178; 180) '{}': () 134 178..180 '{}': ()
135 [185; 207) 'if let...y() {}': () 135 185..207 'if let...y() {}': ()
136 [192; 196) 'true': bool 136 192..196 'true': bool
137 [192; 196) 'true': bool 137 192..196 'true': bool
138 [199; 202) 'any': fn any<bool>() -> bool 138 199..202 'any': fn any<bool>() -> bool
139 [199; 204) 'any()': bool 139 199..204 'any()': bool
140 [205; 207) '{}': () 140 205..207 '{}': ()
141 "### 141 "###
142 ); 142 );
143} 143}
@@ -152,16 +152,16 @@ fn test(x: &i32) {
152} 152}
153"#, true), 153"#, true),
154 @r###" 154 @r###"
155 [9; 10) 'x': &i32 155 9..10 'x': &i32
156 [18; 76) '{ ...2 {} }': () 156 18..76 '{ ...2 {} }': ()
157 [24; 46) 'if let...u32 {}': () 157 24..46 'if let...u32 {}': ()
158 [31; 36) '1..76': u32 158 31..36 '1..76': u32
159 [39; 43) '2u32': u32 159 39..43 '2u32': u32
160 [44; 46) '{}': () 160 44..46 '{}': ()
161 [51; 74) 'if let...u32 {}': () 161 51..74 'if let...u32 {}': ()
162 [58; 64) '1..=76': u32 162 58..64 '1..=76': u32
163 [67; 71) '2u32': u32 163 67..71 '2u32': u32
164 [72; 74) '{}': () 164 72..74 '{}': ()
165 "### 165 "###
166 ); 166 );
167} 167}
@@ -178,19 +178,19 @@ fn test() {
178} 178}
179"#), 179"#),
180 @r###" 180 @r###"
181 [28; 79) '{ ...(1); }': () 181 28..79 '{ ...(1); }': ()
182 [38; 42) 'A(n)': A<i32> 182 38..42 'A(n)': A<i32>
183 [40; 41) 'n': &i32 183 40..41 'n': &i32
184 [45; 50) '&A(1)': &A<i32> 184 45..50 '&A(1)': &A<i32>
185 [46; 47) 'A': A<i32>(i32) -> A<i32> 185 46..47 'A': A<i32>(i32) -> A<i32>
186 [46; 50) 'A(1)': A<i32> 186 46..50 'A(1)': A<i32>
187 [48; 49) '1': i32 187 48..49 '1': i32
188 [60; 64) 'A(n)': A<i32> 188 60..64 'A(n)': A<i32>
189 [62; 63) 'n': &mut i32 189 62..63 'n': &mut i32
190 [67; 76) '&mut A(1)': &mut A<i32> 190 67..76 '&mut A(1)': &mut A<i32>
191 [72; 73) 'A': A<i32>(i32) -> A<i32> 191 72..73 'A': A<i32>(i32) -> A<i32>
192 [72; 76) 'A(1)': A<i32> 192 72..76 'A(1)': A<i32>
193 [74; 75) '1': i32 193 74..75 '1': i32
194 "### 194 "###
195 ); 195 );
196} 196}
@@ -206,18 +206,18 @@ fn test() {
206} 206}
207"#), 207"#),
208 @r###" 208 @r###"
209 [11; 57) '{ ...= v; }': () 209 11..57 '{ ...= v; }': ()
210 [21; 22) 'v': &(i32, &i32) 210 21..22 'v': &(i32, &i32)
211 [25; 33) '&(1, &2)': &(i32, &i32) 211 25..33 '&(1, &2)': &(i32, &i32)
212 [26; 33) '(1, &2)': (i32, &i32) 212 26..33 '(1, &2)': (i32, &i32)
213 [27; 28) '1': i32 213 27..28 '1': i32
214 [30; 32) '&2': &i32 214 30..32 '&2': &i32
215 [31; 32) '2': i32 215 31..32 '2': i32
216 [43; 50) '(_, &w)': (i32, &i32) 216 43..50 '(_, &w)': (i32, &i32)
217 [44; 45) '_': i32 217 44..45 '_': i32
218 [47; 49) '&w': &i32 218 47..49 '&w': &i32
219 [48; 49) 'w': i32 219 48..49 'w': i32
220 [53; 54) 'v': &(i32, &i32) 220 53..54 'v': &(i32, &i32)
221 "### 221 "###
222 ); 222 );
223} 223}
@@ -242,30 +242,30 @@ fn test() {
242} 242}
243"#), 243"#),
244 @r###" 244 @r###"
245 [11; 210) '{ ... } }': () 245 11..210 '{ ... } }': ()
246 [21; 26) 'slice': &[f64] 246 21..26 'slice': &[f64]
247 [37; 43) '&[0.0]': &[f64; _] 247 37..43 '&[0.0]': &[f64; _]
248 [38; 43) '[0.0]': [f64; _] 248 38..43 '[0.0]': [f64; _]
249 [39; 42) '0.0': f64 249 39..42 '0.0': f64
250 [49; 208) 'match ... }': () 250 49..208 'match ... }': ()
251 [55; 60) 'slice': &[f64] 251 55..60 'slice': &[f64]
252 [71; 74) '&[]': &[f64] 252 71..74 '&[]': &[f64]
253 [72; 74) '[]': [f64] 253 72..74 '[]': [f64]
254 [78; 80) '{}': () 254 78..80 '{}': ()
255 [90; 94) '&[a]': &[f64] 255 90..94 '&[a]': &[f64]
256 [91; 94) '[a]': [f64] 256 91..94 '[a]': [f64]
257 [92; 93) 'a': f64 257 92..93 'a': f64
258 [98; 124) '{ ... }': () 258 98..124 '{ ... }': ()
259 [112; 113) 'a': f64 259 112..113 'a': f64
260 [134; 141) '&[b, c]': &[f64] 260 134..141 '&[b, c]': &[f64]
261 [135; 141) '[b, c]': [f64] 261 135..141 '[b, c]': [f64]
262 [136; 137) 'b': f64 262 136..137 'b': f64
263 [139; 140) 'c': f64 263 139..140 'c': f64
264 [145; 186) '{ ... }': () 264 145..186 '{ ... }': ()
265 [159; 160) 'b': f64 265 159..160 'b': f64
266 [174; 175) 'c': f64 266 174..175 'c': f64
267 [195; 196) '_': &[f64] 267 195..196 '_': &[f64]
268 [200; 202) '{}': () 268 200..202 '{}': ()
269 "### 269 "###
270 ); 270 );
271} 271}
@@ -288,25 +288,25 @@ fn test() {
288} 288}
289"#), 289"#),
290 @r###" 290 @r###"
291 [11; 180) '{ ... } }': () 291 11..180 '{ ... } }': ()
292 [21; 24) 'arr': [f64; _] 292 21..24 'arr': [f64; _]
293 [37; 47) '[0.0, 1.0]': [f64; _] 293 37..47 '[0.0, 1.0]': [f64; _]
294 [38; 41) '0.0': f64 294 38..41 '0.0': f64
295 [43; 46) '1.0': f64 295 43..46 '1.0': f64
296 [53; 178) 'match ... }': () 296 53..178 'match ... }': ()
297 [59; 62) 'arr': [f64; _] 297 59..62 'arr': [f64; _]
298 [73; 81) '[1.0, a]': [f64; _] 298 73..81 '[1.0, a]': [f64; _]
299 [74; 77) '1.0': f64 299 74..77 '1.0': f64
300 [74; 77) '1.0': f64 300 74..77 '1.0': f64
301 [79; 80) 'a': f64 301 79..80 'a': f64
302 [85; 111) '{ ... }': () 302 85..111 '{ ... }': ()
303 [99; 100) 'a': f64 303 99..100 'a': f64
304 [121; 127) '[b, c]': [f64; _] 304 121..127 '[b, c]': [f64; _]
305 [122; 123) 'b': f64 305 122..123 'b': f64
306 [125; 126) 'c': f64 306 125..126 'c': f64
307 [131; 172) '{ ... }': () 307 131..172 '{ ... }': ()
308 [145; 146) 'b': f64 308 145..146 'b': f64
309 [160; 161) 'c': f64 309 160..161 'c': f64
310 "### 310 "###
311 ); 311 );
312} 312}
@@ -339,31 +339,31 @@ fn test() {
339} 339}
340"#), 340"#),
341 @r###" 341 @r###"
342 [68; 289) '{ ... d; }': () 342 68..289 '{ ... d; }': ()
343 [78; 79) 'e': E 343 78..79 'e': E
344 [82; 95) 'E::A { x: 3 }': E 344 82..95 'E::A { x: 3 }': E
345 [92; 93) '3': usize 345 92..93 '3': usize
346 [106; 113) 'S(y, z)': S 346 106..113 'S(y, z)': S
347 [108; 109) 'y': u32 347 108..109 'y': u32
348 [111; 112) 'z': E 348 111..112 'z': E
349 [116; 119) 'foo': S 349 116..119 'foo': S
350 [129; 148) 'E::A {..._var }': E 350 129..148 'E::A {..._var }': E
351 [139; 146) 'new_var': usize 351 139..146 'new_var': usize
352 [151; 152) 'e': E 352 151..152 'e': E
353 [159; 245) 'match ... }': usize 353 159..245 'match ... }': usize
354 [165; 166) 'e': E 354 165..166 'e': E
355 [177; 187) 'E::A { x }': E 355 177..187 'E::A { x }': E
356 [184; 185) 'x': usize 356 184..185 'x': usize
357 [191; 192) 'x': usize 357 191..192 'x': usize
358 [202; 206) 'E::B': E 358 202..206 'E::B': E
359 [210; 213) 'foo': bool 359 210..213 'foo': bool
360 [217; 218) '1': usize 360 217..218 '1': usize
361 [228; 232) 'E::B': E 361 228..232 'E::B': E
362 [236; 238) '10': usize 362 236..238 '10': usize
363 [256; 275) 'ref d ...{ .. }': &E 363 256..275 'ref d ...{ .. }': &E
364 [264; 275) 'E::A { .. }': E 364 264..275 'E::A { .. }': E
365 [278; 279) 'e': E 365 278..279 'e': E
366 [285; 286) 'd': &E 366 285..286 'd': &E
367 "### 367 "###
368 ); 368 );
369} 369}
@@ -391,23 +391,23 @@ fn test(a1: A<u32>, o: Option<u64>) {
391} 391}
392"#), 392"#),
393 @r###" 393 @r###"
394 [79; 81) 'a1': A<u32> 394 79..81 'a1': A<u32>
395 [91; 92) 'o': Option<u64> 395 91..92 'o': Option<u64>
396 [107; 244) '{ ... }; }': () 396 107..244 '{ ... }; }': ()
397 [117; 128) 'A { x: x2 }': A<u32> 397 117..128 'A { x: x2 }': A<u32>
398 [124; 126) 'x2': u32 398 124..126 'x2': u32
399 [131; 133) 'a1': A<u32> 399 131..133 'a1': A<u32>
400 [143; 161) 'A::<i6...: x3 }': A<i64> 400 143..161 'A::<i6...: x3 }': A<i64>
401 [157; 159) 'x3': i64 401 157..159 'x3': i64
402 [164; 174) 'A { x: 1 }': A<i64> 402 164..174 'A { x: 1 }': A<i64>
403 [171; 172) '1': i64 403 171..172 '1': i64
404 [180; 241) 'match ... }': u64 404 180..241 'match ... }': u64
405 [186; 187) 'o': Option<u64> 405 186..187 'o': Option<u64>
406 [198; 213) 'Option::Some(t)': Option<u64> 406 198..213 'Option::Some(t)': Option<u64>
407 [211; 212) 't': u64 407 211..212 't': u64
408 [217; 218) 't': u64 408 217..218 't': u64
409 [228; 229) '_': Option<u64> 409 228..229 '_': Option<u64>
410 [233; 234) '1': u64 410 233..234 '1': u64
411 "### 411 "###
412 ); 412 );
413} 413}
@@ -431,27 +431,27 @@ fn test() {
431} 431}
432"#, true), 432"#, true),
433 @r###" 433 @r###"
434 [74; 75) '1': usize 434 74..75 '1': usize
435 [88; 310) '{ ...atch }': () 435 88..310 '{ ...atch }': ()
436 [98; 99) 'a': Option<u32> 436 98..99 'a': Option<u32>
437 [115; 119) 'None': Option<u32> 437 115..119 'None': Option<u32>
438 [129; 130) 'b': Option<i64> 438 129..130 'b': Option<i64>
439 [146; 183) 'match ... }': Option<i64> 439 146..183 'match ... }': Option<i64>
440 [152; 153) 'a': Option<u32> 440 152..153 'a': Option<u32>
441 [164; 168) 'None': Option<u32> 441 164..168 'None': Option<u32>
442 [172; 176) 'None': Option<i64> 442 172..176 'None': Option<i64>
443 [193; 194) '_': () 443 193..194 '_': ()
444 [201; 224) 'match ... Foo }': Foo 444 201..224 'match ... Foo }': Foo
445 [207; 209) '()': () 445 207..209 '()': ()
446 [212; 215) 'Foo': Foo 446 212..215 'Foo': Foo
447 [219; 222) 'Foo': Foo 447 219..222 'Foo': Foo
448 [255; 256) '_': () 448 255..256 '_': ()
449 [263; 286) 'match ... Bar }': usize 449 263..286 'match ... Bar }': usize
450 [269; 271) '()': () 450 269..271 '()': ()
451 [274; 277) 'Bar': usize 451 274..277 'Bar': usize
452 [281; 284) 'Bar': usize 452 281..284 'Bar': usize
453 [201; 224): expected (), got Foo 453 201..224: expected (), got Foo
454 [263; 286): expected (), got usize 454 263..286: expected (), got usize
455 "### 455 "###
456 ); 456 );
457} 457}
@@ -469,15 +469,15 @@ fn main() {
469 } 469 }
470} 470}
471 "#), @" 471 "#), @"
472 [28; 32) 'self': &S 472 28..32 'self': &S
473 [42; 51) '{ false }': bool 473 42..51 '{ false }': bool
474 [44; 49) 'false': bool 474 44..49 'false': bool
475 [65; 116) '{ ... } }': () 475 65..116 '{ ... } }': ()
476 [71; 114) 'match ... }': () 476 71..114 'match ... }': ()
477 [77; 78) 'S': S 477 77..78 'S': S
478 [89; 90) 's': S 478 89..90 's': S
479 [94; 95) 's': S 479 94..95 's': S
480 [94; 101) 's.foo()': bool 480 94..101 's.foo()': bool
481 [105; 107) '()': () 481 105..107 '()': ()
482 ") 482 ")
483} 483}
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs
index 61a6801fc..8a1292c7a 100644
--- a/crates/ra_hir_ty/src/tests/regression.rs
+++ b/crates/ra_hir_ty/src/tests/regression.rs
@@ -14,11 +14,11 @@ fn test() {
14} 14}
15"#), 15"#),
16 @r###" 16 @r###"
17 [11; 37) '{ l... {}; }': () 17 11..37 '{ l... {}; }': ()
18 [20; 21) 'x': () 18 20..21 'x': ()
19 [24; 34) 'if true {}': () 19 24..34 'if true {}': ()
20 [27; 31) 'true': bool 20 27..31 'true': bool
21 [32; 34) '{}': () 21 32..34 '{}': ()
22 "### 22 "###
23 ); 23 );
24} 24}
@@ -34,10 +34,10 @@ fn test(x: X) {
34} 34}
35"#), 35"#),
36 @r###" 36 @r###"
37 [20; 21) 'x': X 37 20..21 'x': X
38 [26; 47) '{ ...eld; }': () 38 26..47 '{ ...eld; }': ()
39 [32; 33) 'x': X 39 32..33 'x': X
40 [32; 44) 'x.some_field': {unknown} 40 32..44 'x.some_field': {unknown}
41 "### 41 "###
42 ); 42 );
43} 43}
@@ -55,14 +55,14 @@ fn test() {
55} 55}
56"#), 56"#),
57 @r###" 57 @r###"
58 [11; 89) '{ ... } }': () 58 11..89 '{ ... } }': ()
59 [17; 21) 'X {}': {unknown} 59 17..21 'X {}': {unknown}
60 [27; 87) 'match ... }': () 60 27..87 'match ... }': ()
61 [33; 34) 'x': {unknown} 61 33..34 'x': {unknown}
62 [45; 52) 'A::B {}': {unknown} 62 45..52 'A::B {}': {unknown}
63 [56; 58) '()': () 63 56..58 '()': ()
64 [68; 74) 'A::Y()': {unknown} 64 68..74 'A::Y()': {unknown}
65 [78; 80) '()': () 65 78..80 '()': ()
66 "### 66 "###
67 ); 67 );
68} 68}
@@ -77,12 +77,12 @@ fn quux() {
77} 77}
78"#), 78"#),
79 @r###" 79 @r###"
80 [11; 41) '{ ...+ y; }': () 80 11..41 '{ ...+ y; }': ()
81 [21; 22) 'y': i32 81 21..22 'y': i32
82 [25; 27) '92': i32 82 25..27 '92': i32
83 [33; 34) '1': i32 83 33..34 '1': i32
84 [33; 38) '1 + y': i32 84 33..38 '1 + y': i32
85 [37; 38) 'y': i32 85 37..38 'y': i32
86 "### 86 "###
87 ); 87 );
88} 88}
@@ -99,13 +99,13 @@ fn test() {
99} 99}
100"#), 100"#),
101 @r###" 101 @r###"
102 [11; 48) '{ ...&y]; }': () 102 11..48 '{ ...&y]; }': ()
103 [21; 22) 'y': &{unknown} 103 21..22 'y': &{unknown}
104 [25; 32) 'unknown': &{unknown} 104 25..32 'unknown': &{unknown}
105 [38; 45) '[y, &y]': [&&{unknown}; _] 105 38..45 '[y, &y]': [&&{unknown}; _]
106 [39; 40) 'y': &{unknown} 106 39..40 'y': &{unknown}
107 [42; 44) '&y': &&{unknown} 107 42..44 '&y': &&{unknown}
108 [43; 44) 'y': &{unknown} 108 43..44 'y': &{unknown}
109 "### 109 "###
110 ); 110 );
111} 111}
@@ -123,20 +123,20 @@ fn test() {
123} 123}
124"#), 124"#),
125 @r###" 125 @r###"
126 [11; 80) '{ ...x)]; }': () 126 11..80 '{ ...x)]; }': ()
127 [21; 22) 'x': &&{unknown} 127 21..22 'x': &&{unknown}
128 [25; 32) 'unknown': &&{unknown} 128 25..32 'unknown': &&{unknown}
129 [42; 43) 'y': &&{unknown} 129 42..43 'y': &&{unknown}
130 [46; 53) 'unknown': &&{unknown} 130 46..53 'unknown': &&{unknown}
131 [59; 77) '[(x, y..., &x)]': [(&&&{unknown}, &&&{unknown}); _] 131 59..77 '[(x, y..., &x)]': [(&&&{unknown}, &&&{unknown}); _]
132 [60; 66) '(x, y)': (&&&{unknown}, &&&{unknown}) 132 60..66 '(x, y)': (&&&{unknown}, &&&{unknown})
133 [61; 62) 'x': &&{unknown} 133 61..62 'x': &&{unknown}
134 [64; 65) 'y': &&{unknown} 134 64..65 'y': &&{unknown}
135 [68; 76) '(&y, &x)': (&&&{unknown}, &&&{unknown}) 135 68..76 '(&y, &x)': (&&&{unknown}, &&&{unknown})
136 [69; 71) '&y': &&&{unknown} 136 69..71 '&y': &&&{unknown}
137 [70; 71) 'y': &&{unknown} 137 70..71 'y': &&{unknown}
138 [73; 75) '&x': &&&{unknown} 138 73..75 '&x': &&&{unknown}
139 [74; 75) 'x': &&{unknown} 139 74..75 'x': &&{unknown}
140 "### 140 "###
141 ); 141 );
142} 142}
@@ -158,12 +158,12 @@ fn write() {
158} 158}
159"#), 159"#),
160 @r###" 160 @r###"
161 [54; 139) '{ ... } }': () 161 54..139 '{ ... } }': ()
162 [60; 137) 'match ... }': () 162 60..137 'match ... }': ()
163 [66; 83) 'someth...nknown': Maybe<{unknown}> 163 66..83 'someth...nknown': Maybe<{unknown}>
164 [94; 124) 'Maybe:...thing)': Maybe<{unknown}> 164 94..124 'Maybe:...thing)': Maybe<{unknown}>
165 [106; 123) 'ref mu...ething': &mut {unknown} 165 106..123 'ref mu...ething': &mut {unknown}
166 [128; 130) '()': () 166 128..130 '()': ()
167 "### 167 "###
168 ); 168 );
169} 169}
@@ -179,13 +179,13 @@ fn test_line_buffer() {
179} 179}
180"#), 180"#),
181 @r###" 181 @r###"
182 [23; 53) '{ ...n']; }': () 182 23..53 '{ ...n']; }': ()
183 [29; 50) '&[0, b...b'\n']': &[u8; _] 183 29..50 '&[0, b...b'\n']': &[u8; _]
184 [30; 50) '[0, b'...b'\n']': [u8; _] 184 30..50 '[0, b'...b'\n']': [u8; _]
185 [31; 32) '0': u8 185 31..32 '0': u8
186 [34; 39) 'b'\n'': u8 186 34..39 'b'\n'': u8
187 [41; 42) '1': u8 187 41..42 '1': u8
188 [44; 49) 'b'\n'': u8 188 44..49 'b'\n'': u8
189 "### 189 "###
190 ); 190 );
191} 191}
@@ -202,14 +202,14 @@ pub fn compute() {
202} 202}
203"#), 203"#),
204 @r###" 204 @r###"
205 [18; 108) '{ ... } }': () 205 18..108 '{ ... } }': ()
206 [24; 106) 'match ... }': () 206 24..106 'match ... }': ()
207 [30; 37) 'nope!()': {unknown} 207 30..37 'nope!()': {unknown}
208 [48; 94) 'SizeSk...tail }': {unknown} 208 48..94 'SizeSk...tail }': {unknown}
209 [82; 86) 'true': bool 209 82..86 'true': bool
210 [82; 86) 'true': bool 210 82..86 'true': bool
211 [88; 92) 'tail': {unknown} 211 88..92 'tail': {unknown}
212 [98; 100) '{}': () 212 98..100 '{}': ()
213 "### 213 "###
214 ); 214 );
215} 215}
@@ -226,14 +226,14 @@ pub fn primitive_type() {
226} 226}
227"#), 227"#),
228 @r###" 228 @r###"
229 [25; 106) '{ ... } }': () 229 25..106 '{ ... } }': ()
230 [31; 104) 'match ... }': () 230 31..104 'match ... }': ()
231 [37; 42) '*self': {unknown} 231 37..42 '*self': {unknown}
232 [38; 42) 'self': {unknown} 232 38..42 'self': {unknown}
233 [53; 91) 'Borrow...), ..}': {unknown} 233 53..91 'Borrow...), ..}': {unknown}
234 [74; 86) 'Primitive(p)': {unknown} 234 74..86 'Primitive(p)': {unknown}
235 [84; 85) 'p': {unknown} 235 84..85 'p': {unknown}
236 [95; 97) '{}': () 236 95..97 '{}': ()
237 "### 237 "###
238 ); 238 );
239} 239}
@@ -260,29 +260,29 @@ fn extra_compiler_flags() {
260} 260}
261"#), 261"#),
262 @r###" 262 @r###"
263 [27; 323) '{ ... } }': () 263 27..323 '{ ... } }': ()
264 [33; 321) 'for co... }': () 264 33..321 'for co... }': ()
265 [37; 44) 'content': &{unknown} 265 37..44 'content': &{unknown}
266 [48; 61) 'doesnt_matter': {unknown} 266 48..61 'doesnt_matter': {unknown}
267 [62; 321) '{ ... }': () 267 62..321 '{ ... }': ()
268 [76; 80) 'name': &&{unknown} 268 76..80 'name': &&{unknown}
269 [83; 167) 'if doe... }': &&{unknown} 269 83..167 'if doe... }': &&{unknown}
270 [86; 99) 'doesnt_matter': bool 270 86..99 'doesnt_matter': bool
271 [100; 129) '{ ... }': &&{unknown} 271 100..129 '{ ... }': &&{unknown}
272 [114; 119) 'first': &&{unknown} 272 114..119 'first': &&{unknown}
273 [135; 167) '{ ... }': &&{unknown} 273 135..167 '{ ... }': &&{unknown}
274 [149; 157) '&content': &&{unknown} 274 149..157 '&content': &&{unknown}
275 [150; 157) 'content': &{unknown} 275 150..157 'content': &{unknown}
276 [182; 189) 'content': &{unknown} 276 182..189 'content': &{unknown}
277 [192; 314) 'if ICE... }': &{unknown} 277 192..314 'if ICE... }': &{unknown}
278 [195; 232) 'ICE_RE..._VALUE': {unknown} 278 195..232 'ICE_RE..._VALUE': {unknown}
279 [195; 248) 'ICE_RE...&name)': bool 279 195..248 'ICE_RE...&name)': bool
280 [242; 247) '&name': &&&{unknown} 280 242..247 '&name': &&&{unknown}
281 [243; 247) 'name': &&{unknown} 281 243..247 'name': &&{unknown}
282 [249; 277) '{ ... }': &&{unknown} 282 249..277 '{ ... }': &&{unknown}
283 [263; 267) 'name': &&{unknown} 283 263..267 'name': &&{unknown}
284 [283; 314) '{ ... }': &{unknown} 284 283..314 '{ ... }': &{unknown}
285 [297; 304) 'content': &{unknown} 285 297..304 'content': &{unknown}
286 "### 286 "###
287 ); 287 );
288} 288}
@@ -303,11 +303,11 @@ fn test<R>(query_response: Canonical<QueryResponse<R>>) {
303} 303}
304"#), 304"#),
305 @r###" 305 @r###"
306 [92; 106) 'query_response': Canonical<QueryResponse<R>> 306 92..106 'query_response': Canonical<QueryResponse<R>>
307 [137; 167) '{ ...lue; }': () 307 137..167 '{ ...lue; }': ()
308 [143; 164) '&query....value': &QueryResponse<R> 308 143..164 '&query....value': &QueryResponse<R>
309 [144; 158) 'query_response': Canonical<QueryResponse<R>> 309 144..158 'query_response': Canonical<QueryResponse<R>>
310 [144; 164) 'query_....value': QueryResponse<R> 310 144..164 'query_....value': QueryResponse<R>
311 "### 311 "###
312 ); 312 );
313} 313}
@@ -322,9 +322,9 @@ fn test() {
322} 322}
323"#), 323"#),
324 @r###" 324 @r###"
325 ![0; 4) '0u32': u32 325 !0..4 '0u32': u32
326 [45; 70) '{ ...()); }': () 326 45..70 '{ ...()); }': ()
327 [55; 56) 'a': u32 327 55..56 'a': u32
328 "### 328 "###
329 ); 329 );
330} 330}
@@ -345,10 +345,10 @@ pub fn main_loop() {
345} 345}
346"#), 346"#),
347 @r###" 347 @r###"
348 [144; 146) '{}': () 348 144..146 '{}': ()
349 [169; 198) '{ ...t(); }': () 349 169..198 '{ ...t(); }': ()
350 [175; 193) 'FxHash...efault': fn default<{unknown}, FxHasher>() -> HashSet<{unknown}, FxHasher> 350 175..193 'FxHash...efault': fn default<{unknown}, FxHasher>() -> HashSet<{unknown}, FxHasher>
351 [175; 195) 'FxHash...ault()': HashSet<{unknown}, FxHasher> 351 175..195 'FxHash...ault()': HashSet<{unknown}, FxHasher>
352 "### 352 "###
353 ); 353 );
354} 354}
@@ -375,13 +375,13 @@ fn issue_2669() {
375 }"# 375 }"#
376 ), 376 ),
377 @r###" 377 @r###"
378 [147; 262) '{ ... }': () 378 147..262 '{ ... }': ()
379 [161; 164) 'end': fn end<{unknown}>() 379 161..164 'end': fn end<{unknown}>()
380 [161; 166) 'end()': () 380 161..166 'end()': ()
381 [199; 252) '{ ... }': () 381 199..252 '{ ... }': ()
382 [221; 223) '_x': ! 382 221..223 '_x': !
383 [230; 237) 'loop {}': ! 383 230..237 'loop {}': !
384 [235; 237) '{}': () 384 235..237 '{}': ()
385 "### 385 "###
386 ) 386 )
387} 387}
@@ -396,9 +396,9 @@ fn test() {
396} 396}
397"#), 397"#),
398 @r###" 398 @r###"
399 [26; 53) '{ ...oo() }': () 399 26..53 '{ ...oo() }': ()
400 [32; 49) '<Trait...>::foo': {unknown} 400 32..49 '<Trait...>::foo': {unknown}
401 [32; 51) '<Trait...:foo()': () 401 32..51 '<Trait...:foo()': ()
402 "### 402 "###
403 ); 403 );
404} 404}
@@ -496,13 +496,13 @@ fn foo(params: &[usize]) {
496} 496}
497"#), 497"#),
498 @r###" 498 @r###"
499 [8; 14) 'params': &[usize] 499 8..14 'params': &[usize]
500 [26; 81) '{ ... } }': () 500 26..81 '{ ... } }': ()
501 [32; 79) 'match ... }': () 501 32..79 'match ... }': ()
502 [38; 44) 'params': &[usize] 502 38..44 'params': &[usize]
503 [55; 67) '[ps @ .., _]': [usize] 503 55..67 '[ps @ .., _]': [usize]
504 [65; 66) '_': usize 504 65..66 '_': usize
505 [71; 73) '{}': () 505 71..73 '{}': ()
506 "### 506 "###
507 ); 507 );
508} 508}
@@ -523,13 +523,13 @@ fn foo(b: Bar) {
523} 523}
524"#), 524"#),
525 @r###" 525 @r###"
526 [36; 37) 'b': Bar 526 36..37 'b': Bar
527 [44; 96) '{ ... } }': () 527 44..96 '{ ... } }': ()
528 [50; 94) 'match ... }': () 528 50..94 'match ... }': ()
529 [56; 57) 'b': Bar 529 56..57 'b': Bar
530 [68; 81) 'Bar { a: .. }': Bar 530 68..81 'Bar { a: .. }': Bar
531 [77; 79) '..': bool 531 77..79 '..': bool
532 [85; 87) '{}': () 532 85..87 '{}': ()
533 "### 533 "###
534 ); 534 );
535} 535}
@@ -564,13 +564,13 @@ where
564} 564}
565"#), 565"#),
566 @r###" 566 @r###"
567 [66; 70) 'self': Self 567 66..70 'self': Self
568 [268; 272) 'self': Self 568 268..272 'self': Self
569 [467; 471) 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}> 569 467..471 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
570 [489; 523) '{ ... }': () 570 489..523 '{ ... }': ()
571 [499; 503) 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}> 571 499..503 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
572 [499; 509) 'self.order': O 572 499..509 'self.order': O
573 [499; 516) 'self.o...into()': dyn QueryFragment<DB> 573 499..516 'self.o...into()': dyn QueryFragment<DB>
574 "### 574 "###
575 ); 575 );
576} 576}
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs
index c2f1ded2f..56abc65b8 100644
--- a/crates/ra_hir_ty/src/tests/simple.rs
+++ b/crates/ra_hir_ty/src/tests/simple.rs
@@ -64,9 +64,9 @@ impl S<u32> {
64} 64}
65"#, 65"#,
66 ), @r###" 66 ), @r###"
67 [63; 93) '{ ... }': () 67 63..93 '{ ... }': ()
68 [73; 86) 'Self { x: 1 }': S<u32> 68 73..86 'Self { x: 1 }': S<u32>
69 [83; 84) '1': u32 69 83..84 '1': u32
70 "###); 70 "###);
71} 71}
72 72
@@ -85,9 +85,9 @@ fn foo() {
85 85
86"#, 86"#,
87 ), @r###" 87 ), @r###"
88 [64; 84) '{ ...1 }; }': () 88 64..84 '{ ...1 }; }': ()
89 [70; 81) 'SS { x: 1 }': S<u32> 89 70..81 'SS { x: 1 }': S<u32>
90 [78; 79) '1': u32 90 78..79 '1': u32
91 "###); 91 "###);
92} 92}
93 93
@@ -175,19 +175,19 @@ fn test(a: u32, b: isize, c: !, d: &str) {
175 1.0f32; 175 1.0f32;
176}"#), 176}"#),
177 @r###" 177 @r###"
178 [9; 10) 'a': u32 178 9..10 'a': u32
179 [17; 18) 'b': isize 179 17..18 'b': isize
180 [27; 28) 'c': ! 180 27..28 'c': !
181 [33; 34) 'd': &str 181 33..34 'd': &str
182 [42; 121) '{ ...f32; }': ! 182 42..121 '{ ...f32; }': !
183 [48; 49) 'a': u32 183 48..49 'a': u32
184 [55; 56) 'b': isize 184 55..56 'b': isize
185 [62; 63) 'c': ! 185 62..63 'c': !
186 [69; 70) 'd': &str 186 69..70 'd': &str
187 [76; 82) '1usize': usize 187 76..82 '1usize': usize
188 [88; 94) '1isize': isize 188 88..94 '1isize': isize
189 [100; 106) '"test"': &str 189 100..106 '"test"': &str
190 [112; 118) '1.0f32': f32 190 112..118 '1.0f32': f32
191 "### 191 "###
192 ); 192 );
193} 193}
@@ -206,17 +206,17 @@ fn test() {
206} 206}
207"#), 207"#),
208 @r###" 208 @r###"
209 [11; 118) '{ ...= e; }': () 209 11..118 '{ ...= e; }': ()
210 [21; 22) 'a': isize 210 21..22 'a': isize
211 [25; 31) '1isize': isize 211 25..31 '1isize': isize
212 [41; 42) 'b': usize 212 41..42 'b': usize
213 [52; 53) '1': usize 213 52..53 '1': usize
214 [63; 64) 'c': usize 214 63..64 'c': usize
215 [67; 68) 'b': usize 215 67..68 'b': usize
216 [78; 79) 'd': u32 216 78..79 'd': u32
217 [94; 95) 'e': i32 217 94..95 'e': i32
218 [105; 106) 'f': i32 218 105..106 'f': i32
219 [114; 115) 'e': i32 219 114..115 'e': i32
220 "### 220 "###
221 ); 221 );
222} 222}
@@ -237,15 +237,15 @@ fn test() {
237} 237}
238"#), 238"#),
239 @r###" 239 @r###"
240 [15; 20) '{ 1 }': u32 240 15..20 '{ 1 }': u32
241 [17; 18) '1': u32 241 17..18 '1': u32
242 [48; 53) '{ 1 }': u32 242 48..53 '{ 1 }': u32
243 [50; 51) '1': u32 243 50..51 '1': u32
244 [67; 91) '{ ...c(); }': () 244 67..91 '{ ...c(); }': ()
245 [73; 74) 'a': fn a() -> u32 245 73..74 'a': fn a() -> u32
246 [73; 76) 'a()': u32 246 73..76 'a()': u32
247 [82; 86) 'b::c': fn c() -> u32 247 82..86 'b::c': fn c() -> u32
248 [82; 88) 'b::c()': u32 248 82..88 'b::c()': u32
249 "### 249 "###
250 ); 250 );
251} 251}
@@ -266,13 +266,13 @@ fn test() {
266} 266}
267"#), 267"#),
268 @r###" 268 @r###"
269 [41; 46) '{ 1 }': i32 269 41..46 '{ 1 }': i32
270 [43; 44) '1': i32 270 43..44 '1': i32
271 [60; 93) '{ ...o(); }': () 271 60..93 '{ ...o(); }': ()
272 [66; 72) 'S::foo': fn foo() -> i32 272 66..72 'S::foo': fn foo() -> i32
273 [66; 74) 'S::foo()': i32 273 66..74 'S::foo()': i32
274 [80; 88) '<S>::foo': fn foo() -> i32 274 80..88 '<S>::foo': fn foo() -> i32
275 [80; 90) '<S>::foo()': i32 275 80..90 '<S>::foo()': i32
276 "### 276 "###
277 ); 277 );
278} 278}
@@ -297,22 +297,22 @@ fn test() {
297} 297}
298"#), 298"#),
299 @r###" 299 @r###"
300 [72; 154) '{ ...a.c; }': () 300 72..154 '{ ...a.c; }': ()
301 [82; 83) 'c': C 301 82..83 'c': C
302 [86; 87) 'C': C(usize) -> C 302 86..87 'C': C(usize) -> C
303 [86; 90) 'C(1)': C 303 86..90 'C(1)': C
304 [88; 89) '1': usize 304 88..89 '1': usize
305 [96; 97) 'B': B 305 96..97 'B': B
306 [107; 108) 'a': A 306 107..108 'a': A
307 [114; 133) 'A { b:...C(1) }': A 307 114..133 'A { b:...C(1) }': A
308 [121; 122) 'B': B 308 121..122 'B': B
309 [127; 128) 'C': C(usize) -> C 309 127..128 'C': C(usize) -> C
310 [127; 131) 'C(1)': C 310 127..131 'C(1)': C
311 [129; 130) '1': usize 311 129..130 '1': usize
312 [139; 140) 'a': A 312 139..140 'a': A
313 [139; 142) 'a.b': B 313 139..142 'a.b': B
314 [148; 149) 'a': A 314 148..149 'a': A
315 [148; 151) 'a.c': C 315 148..151 'a.c': C
316 "### 316 "###
317 ); 317 );
318} 318}
@@ -330,10 +330,10 @@ fn test() {
330 E::V2; 330 E::V2;
331}"#), 331}"#),
332 @r###" 332 @r###"
333 [48; 82) '{ E:...:V2; }': () 333 48..82 '{ E:...:V2; }': ()
334 [52; 70) 'E::V1 ...d: 1 }': E 334 52..70 'E::V1 ...d: 1 }': E
335 [67; 68) '1': u32 335 67..68 '1': u32
336 [74; 79) 'E::V2': E 336 74..79 'E::V2': E
337 "### 337 "###
338 ); 338 );
339} 339}
@@ -357,29 +357,29 @@ fn test(a: &u32, b: &mut u32, c: *const u32, d: *mut u32) {
357} 357}
358"#), 358"#),
359 @r###" 359 @r###"
360 [9; 10) 'a': &u32 360 9..10 'a': &u32
361 [18; 19) 'b': &mut u32 361 18..19 'b': &mut u32
362 [31; 32) 'c': *const u32 362 31..32 'c': *const u32
363 [46; 47) 'd': *mut u32 363 46..47 'd': *mut u32
364 [59; 150) '{ ... *d; }': () 364 59..150 '{ ... *d; }': ()
365 [65; 66) 'a': &u32 365 65..66 'a': &u32
366 [72; 74) '*a': u32 366 72..74 '*a': u32
367 [73; 74) 'a': &u32 367 73..74 'a': &u32
368 [80; 82) '&a': &&u32 368 80..82 '&a': &&u32
369 [81; 82) 'a': &u32 369 81..82 'a': &u32
370 [88; 94) '&mut a': &mut &u32 370 88..94 '&mut a': &mut &u32
371 [93; 94) 'a': &u32 371 93..94 'a': &u32
372 [100; 101) 'b': &mut u32 372 100..101 'b': &mut u32
373 [107; 109) '*b': u32 373 107..109 '*b': u32
374 [108; 109) 'b': &mut u32 374 108..109 'b': &mut u32
375 [115; 117) '&b': &&mut u32 375 115..117 '&b': &&mut u32
376 [116; 117) 'b': &mut u32 376 116..117 'b': &mut u32
377 [123; 124) 'c': *const u32 377 123..124 'c': *const u32
378 [130; 132) '*c': u32 378 130..132 '*c': u32
379 [131; 132) 'c': *const u32 379 131..132 'c': *const u32
380 [138; 139) 'd': *mut u32 380 138..139 'd': *mut u32
381 [145; 147) '*d': u32 381 145..147 '*d': u32
382 [146; 147) 'd': *mut u32 382 146..147 'd': *mut u32
383 "### 383 "###
384 ); 384 );
385} 385}
@@ -409,20 +409,20 @@ fn test() {
409} 409}
410"##), 410"##),
411 @r###" 411 @r###"
412 [11; 221) '{ ...o"#; }': () 412 11..221 '{ ...o"#; }': ()
413 [17; 21) '5i32': i32 413 17..21 '5i32': i32
414 [27; 31) '5f32': f32 414 27..31 '5f32': f32
415 [37; 41) '5f64': f64 415 37..41 '5f64': f64
416 [47; 54) '"hello"': &str 416 47..54 '"hello"': &str
417 [60; 68) 'b"bytes"': &[u8] 417 60..68 'b"bytes"': &[u8]
418 [74; 77) ''c'': char 418 74..77 ''c'': char
419 [83; 87) 'b'b'': u8 419 83..87 'b'b'': u8
420 [93; 97) '3.14': f64 420 93..97 '3.14': f64
421 [103; 107) '5000': i32 421 103..107 '5000': i32
422 [113; 118) 'false': bool 422 113..118 'false': bool
423 [124; 128) 'true': bool 423 124..128 'true': bool
424 [134; 202) 'r#" ... "#': &str 424 134..202 'r#" ... "#': &str
425 [208; 218) 'br#"yolo"#': &[u8] 425 208..218 'br#"yolo"#': &[u8]
426 "### 426 "###
427 ); 427 );
428} 428}
@@ -452,47 +452,47 @@ fn test(x: SomeType) {
452} 452}
453"#), 453"#),
454 @r###" 454 @r###"
455 [27; 28) 'x': SomeType 455 27..28 'x': SomeType
456 [40; 272) '{ ...lo"; }': () 456 40..272 '{ ...lo"; }': ()
457 [50; 51) 'b': bool 457 50..51 'b': bool
458 [54; 59) 'false': bool 458 54..59 'false': bool
459 [69; 70) 'c': bool 459 69..70 'c': bool
460 [73; 75) '!b': bool 460 73..75 '!b': bool
461 [74; 75) 'b': bool 461 74..75 'b': bool
462 [85; 86) 'a': i128 462 85..86 'a': i128
463 [89; 92) '100': i128 463 89..92 '100': i128
464 [102; 103) 'd': i128 464 102..103 'd': i128
465 [112; 114) '-a': i128 465 112..114 '-a': i128
466 [113; 114) 'a': i128 466 113..114 'a': i128
467 [124; 125) 'e': i32 467 124..125 'e': i32
468 [128; 132) '-100': i32 468 128..132 '-100': i32
469 [129; 132) '100': i32 469 129..132 '100': i32
470 [142; 143) 'f': bool 470 142..143 'f': bool
471 [146; 153) '!!!true': bool 471 146..153 '!!!true': bool
472 [147; 153) '!!true': bool 472 147..153 '!!true': bool
473 [148; 153) '!true': bool 473 148..153 '!true': bool
474 [149; 153) 'true': bool 474 149..153 'true': bool
475 [163; 164) 'g': i32 475 163..164 'g': i32
476 [167; 170) '!42': i32 476 167..170 '!42': i32
477 [168; 170) '42': i32 477 168..170 '42': i32
478 [180; 181) 'h': u32 478 180..181 'h': u32
479 [184; 190) '!10u32': u32 479 184..190 '!10u32': u32
480 [185; 190) '10u32': u32 480 185..190 '10u32': u32
481 [200; 201) 'j': i128 481 200..201 'j': i128
482 [204; 206) '!a': i128 482 204..206 '!a': i128
483 [205; 206) 'a': i128 483 205..206 'a': i128
484 [212; 217) '-3.14': f64 484 212..217 '-3.14': f64
485 [213; 217) '3.14': f64 485 213..217 '3.14': f64
486 [223; 225) '!3': i32 486 223..225 '!3': i32
487 [224; 225) '3': i32 487 224..225 '3': i32
488 [231; 233) '-x': {unknown} 488 231..233 '-x': {unknown}
489 [232; 233) 'x': SomeType 489 232..233 'x': SomeType
490 [239; 241) '!x': {unknown} 490 239..241 '!x': {unknown}
491 [240; 241) 'x': SomeType 491 240..241 'x': SomeType
492 [247; 255) '-"hello"': {unknown} 492 247..255 '-"hello"': {unknown}
493 [248; 255) '"hello"': &str 493 248..255 '"hello"': &str
494 [261; 269) '!"hello"': {unknown} 494 261..269 '!"hello"': {unknown}
495 [262; 269) '"hello"': &str 495 262..269 '"hello"': &str
496 "### 496 "###
497 ); 497 );
498} 498}
@@ -515,26 +515,26 @@ fn test() -> &mut &f64 {
515} 515}
516"#), 516"#),
517 @r###" 517 @r###"
518 [14; 15) 'x': u32 518 14..15 'x': u32
519 [22; 24) '{}': () 519 22..24 '{}': ()
520 [78; 231) '{ ...t &c }': &mut &f64 520 78..231 '{ ...t &c }': &mut &f64
521 [88; 89) 'a': u32 521 88..89 'a': u32
522 [92; 108) 'unknow...nction': {unknown} 522 92..108 'unknow...nction': {unknown}
523 [92; 110) 'unknow...tion()': u32 523 92..110 'unknow...tion()': u32
524 [116; 125) 'takes_u32': fn takes_u32(u32) 524 116..125 'takes_u32': fn takes_u32(u32)
525 [116; 128) 'takes_u32(a)': () 525 116..128 'takes_u32(a)': ()
526 [126; 127) 'a': u32 526 126..127 'a': u32
527 [138; 139) 'b': i32 527 138..139 'b': i32
528 [142; 158) 'unknow...nction': {unknown} 528 142..158 'unknow...nction': {unknown}
529 [142; 160) 'unknow...tion()': i32 529 142..160 'unknow...tion()': i32
530 [166; 184) 'S { i3...d: b }': S 530 166..184 'S { i3...d: b }': S
531 [181; 182) 'b': i32 531 181..182 'b': i32
532 [194; 195) 'c': f64 532 194..195 'c': f64
533 [198; 214) 'unknow...nction': {unknown} 533 198..214 'unknow...nction': {unknown}
534 [198; 216) 'unknow...tion()': f64 534 198..216 'unknow...tion()': f64
535 [222; 229) '&mut &c': &mut &f64 535 222..229 '&mut &c': &mut &f64
536 [227; 229) '&c': &f64 536 227..229 '&c': &f64
537 [228; 229) 'c': f64 537 228..229 'c': f64
538 "### 538 "###
539 ); 539 );
540} 540}
@@ -561,16 +561,16 @@ impl S {
561} 561}
562"#), 562"#),
563 @r###" 563 @r###"
564 [34; 38) 'self': &S 564 34..38 'self': &S
565 [40; 61) '{ ... }': () 565 40..61 '{ ... }': ()
566 [50; 54) 'self': &S 566 50..54 'self': &S
567 [75; 79) 'self': &S 567 75..79 'self': &S
568 [88; 109) '{ ... }': () 568 88..109 '{ ... }': ()
569 [98; 102) 'self': &S 569 98..102 'self': &S
570 [133; 153) '{ ... }': S 570 133..153 '{ ... }': S
571 [143; 147) 'S {}': S 571 143..147 'S {}': S
572 [177; 200) '{ ... }': S 572 177..200 '{ ... }': S
573 [187; 194) 'Self {}': S 573 187..194 'Self {}': S
574 "### 574 "###
575 ); 575 );
576} 576}
@@ -600,56 +600,56 @@ fn test() -> bool {
600} 600}
601"#), 601"#),
602 @r###" 602 @r###"
603 [6; 7) 'x': bool 603 6..7 'x': bool
604 [22; 34) '{ 0i32 }': i32 604 22..34 '{ 0i32 }': i32
605 [28; 32) '0i32': i32 605 28..32 '0i32': i32
606 [54; 370) '{ ... < 3 }': bool 606 54..370 '{ ... < 3 }': bool
607 [64; 65) 'x': bool 607 64..65 'x': bool
608 [68; 69) 'a': bool 608 68..69 'a': bool
609 [68; 74) 'a && b': bool 609 68..74 'a && b': bool
610 [73; 74) 'b': bool 610 73..74 'b': bool
611 [84; 85) 'y': bool 611 84..85 'y': bool
612 [88; 92) 'true': bool 612 88..92 'true': bool
613 [88; 101) 'true || false': bool 613 88..101 'true || false': bool
614 [96; 101) 'false': bool 614 96..101 'false': bool
615 [111; 112) 'z': bool 615 111..112 'z': bool
616 [115; 116) 'x': bool 616 115..116 'x': bool
617 [115; 121) 'x == y': bool 617 115..121 'x == y': bool
618 [120; 121) 'y': bool 618 120..121 'y': bool
619 [131; 132) 't': bool 619 131..132 't': bool
620 [135; 136) 'x': bool 620 135..136 'x': bool
621 [135; 141) 'x != y': bool 621 135..141 'x != y': bool
622 [140; 141) 'y': bool 622 140..141 'y': bool
623 [151; 162) 'minus_forty': isize 623 151..162 'minus_forty': isize
624 [172; 180) '-40isize': isize 624 172..180 '-40isize': isize
625 [173; 180) '40isize': isize 625 173..180 '40isize': isize
626 [190; 191) 'h': bool 626 190..191 'h': bool
627 [194; 205) 'minus_forty': isize 627 194..205 'minus_forty': isize
628 [194; 216) 'minus_...ONST_2': bool 628 194..216 'minus_...ONST_2': bool
629 [209; 216) 'CONST_2': isize 629 209..216 'CONST_2': isize
630 [226; 227) 'c': i32 630 226..227 'c': i32
631 [230; 231) 'f': fn f(bool) -> i32 631 230..231 'f': fn f(bool) -> i32
632 [230; 239) 'f(z || y)': i32 632 230..239 'f(z || y)': i32
633 [230; 243) 'f(z || y) + 5': i32 633 230..243 'f(z || y) + 5': i32
634 [232; 233) 'z': bool 634 232..233 'z': bool
635 [232; 238) 'z || y': bool 635 232..238 'z || y': bool
636 [237; 238) 'y': bool 636 237..238 'y': bool
637 [242; 243) '5': i32 637 242..243 '5': i32
638 [253; 254) 'd': {unknown} 638 253..254 'd': {unknown}
639 [257; 258) 'b': {unknown} 639 257..258 'b': {unknown}
640 [268; 269) 'g': () 640 268..269 'g': ()
641 [272; 283) 'minus_forty': isize 641 272..283 'minus_forty': isize
642 [272; 288) 'minus_...y ^= i': () 642 272..288 'minus_...y ^= i': ()
643 [287; 288) 'i': isize 643 287..288 'i': isize
644 [298; 301) 'ten': usize 644 298..301 'ten': usize
645 [311; 313) '10': usize 645 311..313 '10': usize
646 [323; 336) 'ten_is_eleven': bool 646 323..336 'ten_is_eleven': bool
647 [339; 342) 'ten': usize 647 339..342 'ten': usize
648 [339; 354) 'ten == some_num': bool 648 339..354 'ten == some_num': bool
649 [346; 354) 'some_num': usize 649 346..354 'some_num': usize
650 [361; 364) 'ten': usize 650 361..364 'ten': usize
651 [361; 368) 'ten < 3': bool 651 361..368 'ten < 3': bool
652 [367; 368) '3': usize 652 367..368 '3': usize
653 "### 653 "###
654 ); 654 );
655} 655}
@@ -664,13 +664,13 @@ fn test() {
664} 664}
665"#), 665"#),
666 @r###" 666 @r###"
667 [11; 48) '{ ...5u8; }': () 667 11..48 '{ ...5u8; }': ()
668 [17; 21) '1u32': u32 668 17..21 '1u32': u32
669 [17; 28) '1u32 << 5u8': u32 669 17..28 '1u32 << 5u8': u32
670 [25; 28) '5u8': u8 670 25..28 '5u8': u8
671 [34; 38) '1u32': u32 671 34..38 '1u32': u32
672 [34; 45) '1u32 >> 5u8': u32 672 34..45 '1u32 >> 5u8': u32
673 [42; 45) '5u8': u8 673 42..45 '5u8': u8
674 "### 674 "###
675 ); 675 );
676} 676}
@@ -703,49 +703,49 @@ fn test2(a1: *const A, a2: *mut A) {
703} 703}
704"#), 704"#),
705 @r###" 705 @r###"
706 [44; 45) 'a': A 706 44..45 'a': A
707 [50; 213) '{ ...5.b; }': () 707 50..213 '{ ...5.b; }': ()
708 [60; 62) 'a1': A 708 60..62 'a1': A
709 [65; 66) 'a': A 709 65..66 'a': A
710 [72; 74) 'a1': A 710 72..74 'a1': A
711 [72; 76) 'a1.b': B 711 72..76 'a1.b': B
712 [86; 88) 'a2': &A 712 86..88 'a2': &A
713 [91; 93) '&a': &A 713 91..93 '&a': &A
714 [92; 93) 'a': A 714 92..93 'a': A
715 [99; 101) 'a2': &A 715 99..101 'a2': &A
716 [99; 103) 'a2.b': B 716 99..103 'a2.b': B
717 [113; 115) 'a3': &mut A 717 113..115 'a3': &mut A
718 [118; 124) '&mut a': &mut A 718 118..124 '&mut a': &mut A
719 [123; 124) 'a': A 719 123..124 'a': A
720 [130; 132) 'a3': &mut A 720 130..132 'a3': &mut A
721 [130; 134) 'a3.b': B 721 130..134 'a3.b': B
722 [144; 146) 'a4': &&&&&&&A 722 144..146 'a4': &&&&&&&A
723 [149; 157) '&&&&&&&a': &&&&&&&A 723 149..157 '&&&&&&&a': &&&&&&&A
724 [150; 157) '&&&&&&a': &&&&&&A 724 150..157 '&&&&&&a': &&&&&&A
725 [151; 157) '&&&&&a': &&&&&A 725 151..157 '&&&&&a': &&&&&A
726 [152; 157) '&&&&a': &&&&A 726 152..157 '&&&&a': &&&&A
727 [153; 157) '&&&a': &&&A 727 153..157 '&&&a': &&&A
728 [154; 157) '&&a': &&A 728 154..157 '&&a': &&A
729 [155; 157) '&a': &A 729 155..157 '&a': &A
730 [156; 157) 'a': A 730 156..157 'a': A
731 [163; 165) 'a4': &&&&&&&A 731 163..165 'a4': &&&&&&&A
732 [163; 167) 'a4.b': B 732 163..167 'a4.b': B
733 [177; 179) 'a5': &mut &&mut &&mut A 733 177..179 'a5': &mut &&mut &&mut A
734 [182; 200) '&mut &...&mut a': &mut &&mut &&mut A 734 182..200 '&mut &...&mut a': &mut &&mut &&mut A
735 [187; 200) '&&mut &&mut a': &&mut &&mut A 735 187..200 '&&mut &&mut a': &&mut &&mut A
736 [188; 200) '&mut &&mut a': &mut &&mut A 736 188..200 '&mut &&mut a': &mut &&mut A
737 [193; 200) '&&mut a': &&mut A 737 193..200 '&&mut a': &&mut A
738 [194; 200) '&mut a': &mut A 738 194..200 '&mut a': &mut A
739 [199; 200) 'a': A 739 199..200 'a': A
740 [206; 208) 'a5': &mut &&mut &&mut A 740 206..208 'a5': &mut &&mut &&mut A
741 [206; 210) 'a5.b': B 741 206..210 'a5.b': B
742 [224; 226) 'a1': *const A 742 224..226 'a1': *const A
743 [238; 240) 'a2': *mut A 743 238..240 'a2': *mut A
744 [250; 273) '{ ...2.b; }': () 744 250..273 '{ ...2.b; }': ()
745 [256; 258) 'a1': *const A 745 256..258 'a1': *const A
746 [256; 260) 'a1.b': B 746 256..260 'a1.b': B
747 [266; 268) 'a2': *mut A 747 266..268 'a2': *mut A
748 [266; 270) 'a2.b': B 748 266..270 'a2.b': B
749 "### 749 "###
750 ); 750 );
751} 751}
@@ -782,30 +782,30 @@ fn test() {
782} 782}
783"#), 783"#),
784 @r###" 784 @r###"
785 [68; 72) 'self': &Self 785 68..72 'self': &Self
786 [139; 143) 'self': &A<T> 786 139..143 'self': &A<T>
787 [151; 174) '{ ... }': &T 787 151..174 '{ ... }': &T
788 [161; 168) '&self.0': &T 788 161..168 '&self.0': &T
789 [162; 166) 'self': &A<T> 789 162..166 'self': &A<T>
790 [162; 168) 'self.0': T 790 162..168 'self.0': T
791 [255; 259) 'self': &B<T> 791 255..259 'self': &B<T>
792 [278; 301) '{ ... }': &T 792 278..301 '{ ... }': &T
793 [288; 295) '&self.0': &T 793 288..295 '&self.0': &T
794 [289; 293) 'self': &B<T> 794 289..293 'self': &B<T>
795 [289; 295) 'self.0': T 795 289..295 'self.0': T
796 [315; 353) '{ ...))); }': () 796 315..353 '{ ...))); }': ()
797 [325; 326) 't': &i32 797 325..326 't': &i32
798 [329; 335) 'A::foo': fn foo<i32>(&A<i32>) -> &i32 798 329..335 'A::foo': fn foo<i32>(&A<i32>) -> &i32
799 [329; 350) 'A::foo...42))))': &i32 799 329..350 'A::foo...42))))': &i32
800 [336; 349) '&&B(B(A(42)))': &&B<B<A<i32>>> 800 336..349 '&&B(B(A(42)))': &&B<B<A<i32>>>
801 [337; 349) '&B(B(A(42)))': &B<B<A<i32>>> 801 337..349 '&B(B(A(42)))': &B<B<A<i32>>>
802 [338; 339) 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>> 802 338..339 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
803 [338; 349) 'B(B(A(42)))': B<B<A<i32>>> 803 338..349 'B(B(A(42)))': B<B<A<i32>>>
804 [340; 341) 'B': B<A<i32>>(A<i32>) -> B<A<i32>> 804 340..341 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
805 [340; 348) 'B(A(42))': B<A<i32>> 805 340..348 'B(A(42))': B<A<i32>>
806 [342; 343) 'A': A<i32>(i32) -> A<i32> 806 342..343 'A': A<i32>(i32) -> A<i32>
807 [342; 347) 'A(42)': A<i32> 807 342..347 'A(42)': A<i32>
808 [344; 346) '42': i32 808 344..346 '42': i32
809 "### 809 "###
810 ); 810 );
811} 811}
@@ -842,34 +842,34 @@ fn test(a: A<i32>) {
842} 842}
843"#), 843"#),
844 @r###" 844 @r###"
845 [68; 72) 'self': &Self 845 68..72 'self': &Self
846 [144; 148) 'self': &A<T> 846 144..148 'self': &A<T>
847 [150; 151) 'x': &A<T> 847 150..151 'x': &A<T>
848 [166; 187) '{ ... }': &T 848 166..187 '{ ... }': &T
849 [176; 181) '&*x.0': &T 849 176..181 '&*x.0': &T
850 [177; 181) '*x.0': T 850 177..181 '*x.0': T
851 [178; 179) 'x': &A<T> 851 178..179 'x': &A<T>
852 [178; 181) 'x.0': *mut T 852 178..181 'x.0': *mut T
853 [268; 272) 'self': &B<T> 853 268..272 'self': &B<T>
854 [291; 314) '{ ... }': &T 854 291..314 '{ ... }': &T
855 [301; 308) '&self.0': &T 855 301..308 '&self.0': &T
856 [302; 306) 'self': &B<T> 856 302..306 'self': &B<T>
857 [302; 308) 'self.0': T 857 302..308 'self.0': T
858 [326; 327) 'a': A<i32> 858 326..327 'a': A<i32>
859 [337; 383) '{ ...))); }': () 859 337..383 '{ ...))); }': ()
860 [347; 348) 't': &i32 860 347..348 't': &i32
861 [351; 352) 'A': A<i32>(*mut i32) -> A<i32> 861 351..352 'A': A<i32>(*mut i32) -> A<i32>
862 [351; 365) 'A(0 as *mut _)': A<i32> 862 351..365 'A(0 as *mut _)': A<i32>
863 [351; 380) 'A(0 as...B(a)))': &i32 863 351..380 'A(0 as...B(a)))': &i32
864 [353; 354) '0': i32 864 353..354 '0': i32
865 [353; 364) '0 as *mut _': *mut i32 865 353..364 '0 as *mut _': *mut i32
866 [370; 379) '&&B(B(a))': &&B<B<A<i32>>> 866 370..379 '&&B(B(a))': &&B<B<A<i32>>>
867 [371; 379) '&B(B(a))': &B<B<A<i32>>> 867 371..379 '&B(B(a))': &B<B<A<i32>>>
868 [372; 373) 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>> 868 372..373 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
869 [372; 379) 'B(B(a))': B<B<A<i32>>> 869 372..379 'B(B(a))': B<B<A<i32>>>
870 [374; 375) 'B': B<A<i32>>(A<i32>) -> B<A<i32>> 870 374..375 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
871 [374; 378) 'B(a)': B<A<i32>> 871 374..378 'B(a)': B<A<i32>>
872 [376; 377) 'a': A<i32> 872 376..377 'a': A<i32>
873 "### 873 "###
874 ); 874 );
875} 875}
@@ -888,16 +888,16 @@ fn main(foo: Foo) {
888} 888}
889"#), 889"#),
890 @r###" 890 @r###"
891 [35; 38) 'foo': Foo 891 35..38 'foo': Foo
892 [45; 109) '{ ... } }': () 892 45..109 '{ ... } }': ()
893 [51; 107) 'if tru... }': () 893 51..107 'if tru... }': ()
894 [54; 58) 'true': bool 894 54..58 'true': bool
895 [59; 67) '{ }': () 895 59..67 '{ }': ()
896 [73; 107) 'if fal... }': () 896 73..107 'if fal... }': ()
897 [76; 81) 'false': bool 897 76..81 'false': bool
898 [82; 107) '{ ... }': i32 898 82..107 '{ ... }': i32
899 [92; 95) 'foo': Foo 899 92..95 'foo': Foo
900 [92; 101) 'foo.field': i32 900 92..101 'foo.field': i32
901 "### 901 "###
902 ) 902 )
903} 903}
@@ -929,38 +929,38 @@ fn foo() {
929 }; 929 };
930}"#), 930}"#),
931 @r###" 931 @r###"
932 [10; 323) '{ ... }; }': () 932 10..323 '{ ... }; }': ()
933 [20; 23) '_x1': i32 933 20..23 '_x1': i32
934 [26; 80) 'if tru... }': i32 934 26..80 'if tru... }': i32
935 [29; 33) 'true': bool 935 29..33 'true': bool
936 [34; 51) '{ ... }': i32 936 34..51 '{ ... }': i32
937 [44; 45) '1': i32 937 44..45 '1': i32
938 [57; 80) '{ ... }': ! 938 57..80 '{ ... }': !
939 [67; 73) 'return': ! 939 67..73 'return': !
940 [90; 93) '_x2': i32 940 90..93 '_x2': i32
941 [96; 149) 'if tru... }': i32 941 96..149 'if tru... }': i32
942 [99; 103) 'true': bool 942 99..103 'true': bool
943 [104; 121) '{ ... }': i32 943 104..121 '{ ... }': i32
944 [114; 115) '2': i32 944 114..115 '2': i32
945 [127; 149) '{ ... }': ! 945 127..149 '{ ... }': !
946 [137; 143) 'return': ! 946 137..143 'return': !
947 [159; 162) '_x3': i32 947 159..162 '_x3': i32
948 [165; 247) 'match ... }': i32 948 165..247 'match ... }': i32
949 [171; 175) 'true': bool 949 171..175 'true': bool
950 [186; 190) 'true': bool 950 186..190 'true': bool
951 [186; 190) 'true': bool 951 186..190 'true': bool
952 [194; 195) '3': i32 952 194..195 '3': i32
953 [205; 206) '_': bool 953 205..206 '_': bool
954 [210; 241) '{ ... }': ! 954 210..241 '{ ... }': !
955 [224; 230) 'return': ! 955 224..230 'return': !
956 [257; 260) '_x4': i32 956 257..260 '_x4': i32
957 [263; 320) 'match ... }': i32 957 263..320 'match ... }': i32
958 [269; 273) 'true': bool 958 269..273 'true': bool
959 [284; 288) 'true': bool 959 284..288 'true': bool
960 [284; 288) 'true': bool 960 284..288 'true': bool
961 [292; 293) '4': i32 961 292..293 '4': i32
962 [303; 304) '_': bool 962 303..304 '_': bool
963 [308; 314) 'return': ! 963 308..314 'return': !
964 "### 964 "###
965 ) 965 )
966} 966}
@@ -988,24 +988,24 @@ fn test(a: A) {
988} 988}
989"#), 989"#),
990 @r###" 990 @r###"
991 [32; 36) 'self': A 991 32..36 'self': A
992 [38; 39) 'x': u32 992 38..39 'x': u32
993 [53; 55) '{}': () 993 53..55 '{}': ()
994 [103; 107) 'self': &A 994 103..107 'self': &A
995 [109; 110) 'x': u64 995 109..110 'x': u64
996 [124; 126) '{}': () 996 124..126 '{}': ()
997 [144; 145) 'a': A 997 144..145 'a': A
998 [150; 198) '{ ...(1); }': () 998 150..198 '{ ...(1); }': ()
999 [156; 157) 'a': A 999 156..157 'a': A
1000 [156; 164) 'a.foo(1)': i32 1000 156..164 'a.foo(1)': i32
1001 [162; 163) '1': u32 1001 162..163 '1': u32
1002 [170; 181) '(&a).bar(1)': i64 1002 170..181 '(&a).bar(1)': i64
1003 [171; 173) '&a': &A 1003 171..173 '&a': &A
1004 [172; 173) 'a': A 1004 172..173 'a': A
1005 [179; 180) '1': u64 1005 179..180 '1': u64
1006 [187; 188) 'a': A 1006 187..188 'a': A
1007 [187; 195) 'a.bar(1)': i64 1007 187..195 'a.bar(1)': i64
1008 [193; 194) '1': u64 1008 193..194 '1': u64
1009 "### 1009 "###
1010 ); 1010 );
1011} 1011}
@@ -1024,11 +1024,11 @@ fn test() {
1024} 1024}
1025"#), 1025"#),
1026 @r###" 1026 @r###"
1027 [40; 44) 'self': &str 1027 40..44 'self': &str
1028 [53; 55) '{}': () 1028 53..55 '{}': ()
1029 [69; 89) '{ ...o(); }': () 1029 69..89 '{ ...o(); }': ()
1030 [75; 80) '"foo"': &str 1030 75..80 '"foo"': &str
1031 [75; 86) '"foo".foo()': i32 1031 75..86 '"foo".foo()': i32
1032 "### 1032 "###
1033 ); 1033 );
1034} 1034}
@@ -1047,33 +1047,33 @@ fn test(x: &str, y: isize) {
1047} 1047}
1048"#), 1048"#),
1049 @r###" 1049 @r###"
1050 [9; 10) 'x': &str 1050 9..10 'x': &str
1051 [18; 19) 'y': isize 1051 18..19 'y': isize
1052 [28; 170) '{ ...d"); }': () 1052 28..170 '{ ...d"); }': ()
1053 [38; 39) 'a': (u32, &str) 1053 38..39 'a': (u32, &str)
1054 [55; 63) '(1, "a")': (u32, &str) 1054 55..63 '(1, "a")': (u32, &str)
1055 [56; 57) '1': u32 1055 56..57 '1': u32
1056 [59; 62) '"a"': &str 1056 59..62 '"a"': &str
1057 [73; 74) 'b': ((u32, &str), &str) 1057 73..74 'b': ((u32, &str), &str)
1058 [77; 83) '(a, x)': ((u32, &str), &str) 1058 77..83 '(a, x)': ((u32, &str), &str)
1059 [78; 79) 'a': (u32, &str) 1059 78..79 'a': (u32, &str)
1060 [81; 82) 'x': &str 1060 81..82 'x': &str
1061 [93; 94) 'c': (isize, &str) 1061 93..94 'c': (isize, &str)
1062 [97; 103) '(y, x)': (isize, &str) 1062 97..103 '(y, x)': (isize, &str)
1063 [98; 99) 'y': isize 1063 98..99 'y': isize
1064 [101; 102) 'x': &str 1064 101..102 'x': &str
1065 [113; 114) 'd': ((isize, &str), &str) 1065 113..114 'd': ((isize, &str), &str)
1066 [117; 123) '(c, x)': ((isize, &str), &str) 1066 117..123 '(c, x)': ((isize, &str), &str)
1067 [118; 119) 'c': (isize, &str) 1067 118..119 'c': (isize, &str)
1068 [121; 122) 'x': &str 1068 121..122 'x': &str
1069 [133; 134) 'e': (i32, &str) 1069 133..134 'e': (i32, &str)
1070 [137; 145) '(1, "e")': (i32, &str) 1070 137..145 '(1, "e")': (i32, &str)
1071 [138; 139) '1': i32 1071 138..139 '1': i32
1072 [141; 144) '"e"': &str 1072 141..144 '"e"': &str
1073 [155; 156) 'f': ((i32, &str), &str) 1073 155..156 'f': ((i32, &str), &str)
1074 [159; 167) '(e, "d")': ((i32, &str), &str) 1074 159..167 '(e, "d")': ((i32, &str), &str)
1075 [160; 161) 'e': (i32, &str) 1075 160..161 'e': (i32, &str)
1076 [163; 166) '"d"': &str 1076 163..166 '"d"': &str
1077 "### 1077 "###
1078 ); 1078 );
1079} 1079}
@@ -1101,58 +1101,58 @@ fn test(x: &str, y: isize) {
1101} 1101}
1102"#), 1102"#),
1103 @r###" 1103 @r###"
1104 [9; 10) 'x': &str 1104 9..10 'x': &str
1105 [18; 19) 'y': isize 1105 18..19 'y': isize
1106 [28; 293) '{ ... []; }': () 1106 28..293 '{ ... []; }': ()
1107 [38; 39) 'a': [&str; _] 1107 38..39 'a': [&str; _]
1108 [42; 45) '[x]': [&str; _] 1108 42..45 '[x]': [&str; _]
1109 [43; 44) 'x': &str 1109 43..44 'x': &str
1110 [55; 56) 'b': [[&str; _]; _] 1110 55..56 'b': [[&str; _]; _]
1111 [59; 65) '[a, a]': [[&str; _]; _] 1111 59..65 '[a, a]': [[&str; _]; _]
1112 [60; 61) 'a': [&str; _] 1112 60..61 'a': [&str; _]
1113 [63; 64) 'a': [&str; _] 1113 63..64 'a': [&str; _]
1114 [75; 76) 'c': [[[&str; _]; _]; _] 1114 75..76 'c': [[[&str; _]; _]; _]
1115 [79; 85) '[b, b]': [[[&str; _]; _]; _] 1115 79..85 '[b, b]': [[[&str; _]; _]; _]
1116 [80; 81) 'b': [[&str; _]; _] 1116 80..81 'b': [[&str; _]; _]
1117 [83; 84) 'b': [[&str; _]; _] 1117 83..84 'b': [[&str; _]; _]
1118 [96; 97) 'd': [isize; _] 1118 96..97 'd': [isize; _]
1119 [100; 112) '[y, 1, 2, 3]': [isize; _] 1119 100..112 '[y, 1, 2, 3]': [isize; _]
1120 [101; 102) 'y': isize 1120 101..102 'y': isize
1121 [104; 105) '1': isize 1121 104..105 '1': isize
1122 [107; 108) '2': isize 1122 107..108 '2': isize
1123 [110; 111) '3': isize 1123 110..111 '3': isize
1124 [122; 123) 'd': [isize; _] 1124 122..123 'd': [isize; _]
1125 [126; 138) '[1, y, 2, 3]': [isize; _] 1125 126..138 '[1, y, 2, 3]': [isize; _]
1126 [127; 128) '1': isize 1126 127..128 '1': isize
1127 [130; 131) 'y': isize 1127 130..131 'y': isize
1128 [133; 134) '2': isize 1128 133..134 '2': isize
1129 [136; 137) '3': isize 1129 136..137 '3': isize
1130 [148; 149) 'e': [isize; _] 1130 148..149 'e': [isize; _]
1131 [152; 155) '[y]': [isize; _] 1131 152..155 '[y]': [isize; _]
1132 [153; 154) 'y': isize 1132 153..154 'y': isize
1133 [165; 166) 'f': [[isize; _]; _] 1133 165..166 'f': [[isize; _]; _]
1134 [169; 175) '[d, d]': [[isize; _]; _] 1134 169..175 '[d, d]': [[isize; _]; _]
1135 [170; 171) 'd': [isize; _] 1135 170..171 'd': [isize; _]
1136 [173; 174) 'd': [isize; _] 1136 173..174 'd': [isize; _]
1137 [185; 186) 'g': [[isize; _]; _] 1137 185..186 'g': [[isize; _]; _]
1138 [189; 195) '[e, e]': [[isize; _]; _] 1138 189..195 '[e, e]': [[isize; _]; _]
1139 [190; 191) 'e': [isize; _] 1139 190..191 'e': [isize; _]
1140 [193; 194) 'e': [isize; _] 1140 193..194 'e': [isize; _]
1141 [206; 207) 'h': [i32; _] 1141 206..207 'h': [i32; _]
1142 [210; 216) '[1, 2]': [i32; _] 1142 210..216 '[1, 2]': [i32; _]
1143 [211; 212) '1': i32 1143 211..212 '1': i32
1144 [214; 215) '2': i32 1144 214..215 '2': i32
1145 [226; 227) 'i': [&str; _] 1145 226..227 'i': [&str; _]
1146 [230; 240) '["a", "b"]': [&str; _] 1146 230..240 '["a", "b"]': [&str; _]
1147 [231; 234) '"a"': &str 1147 231..234 '"a"': &str
1148 [236; 239) '"b"': &str 1148 236..239 '"b"': &str
1149 [251; 252) 'b': [[&str; _]; _] 1149 251..252 'b': [[&str; _]; _]
1150 [255; 265) '[a, ["b"]]': [[&str; _]; _] 1150 255..265 '[a, ["b"]]': [[&str; _]; _]
1151 [256; 257) 'a': [&str; _] 1151 256..257 'a': [&str; _]
1152 [259; 264) '["b"]': [&str; _] 1152 259..264 '["b"]': [&str; _]
1153 [260; 263) '"b"': &str 1153 260..263 '"b"': &str
1154 [275; 276) 'x': [u8; _] 1154 275..276 'x': [u8; _]
1155 [288; 290) '[]': [u8; _] 1155 288..290 '[]': [u8; _]
1156 "### 1156 "###
1157 ); 1157 );
1158} 1158}
@@ -1174,21 +1174,21 @@ fn test(a1: A<u32>, i: i32) {
1174} 1174}
1175"#), 1175"#),
1176 @r###" 1176 @r###"
1177 [36; 38) 'a1': A<u32> 1177 36..38 'a1': A<u32>
1178 [48; 49) 'i': i32 1178 48..49 'i': i32
1179 [56; 147) '{ ...3.x; }': () 1179 56..147 '{ ...3.x; }': ()
1180 [62; 64) 'a1': A<u32> 1180 62..64 'a1': A<u32>
1181 [62; 66) 'a1.x': u32 1181 62..66 'a1.x': u32
1182 [76; 78) 'a2': A<i32> 1182 76..78 'a2': A<i32>
1183 [81; 91) 'A { x: i }': A<i32> 1183 81..91 'A { x: i }': A<i32>
1184 [88; 89) 'i': i32 1184 88..89 'i': i32
1185 [97; 99) 'a2': A<i32> 1185 97..99 'a2': A<i32>
1186 [97; 101) 'a2.x': i32 1186 97..101 'a2.x': i32
1187 [111; 113) 'a3': A<i128> 1187 111..113 'a3': A<i128>
1188 [116; 134) 'A::<i1...x: 1 }': A<i128> 1188 116..134 'A::<i1...x: 1 }': A<i128>
1189 [131; 132) '1': i128 1189 131..132 '1': i128
1190 [140; 142) 'a3': A<i128> 1190 140..142 'a3': A<i128>
1191 [140; 144) 'a3.x': i128 1191 140..144 'a3.x': i128
1192 "### 1192 "###
1193 ); 1193 );
1194} 1194}
@@ -1211,22 +1211,22 @@ fn test() {
1211} 1211}
1212"#), 1212"#),
1213 @r###" 1213 @r###"
1214 [76; 184) '{ ...one; }': () 1214 76..184 '{ ...one; }': ()
1215 [82; 83) 'A': A<i32>(i32) -> A<i32> 1215 82..83 'A': A<i32>(i32) -> A<i32>
1216 [82; 87) 'A(42)': A<i32> 1216 82..87 'A(42)': A<i32>
1217 [84; 86) '42': i32 1217 84..86 '42': i32
1218 [93; 94) 'A': A<u128>(u128) -> A<u128> 1218 93..94 'A': A<u128>(u128) -> A<u128>
1219 [93; 102) 'A(42u128)': A<u128> 1219 93..102 'A(42u128)': A<u128>
1220 [95; 101) '42u128': u128 1220 95..101 '42u128': u128
1221 [108; 112) 'Some': Some<&str>(&str) -> Option<&str> 1221 108..112 'Some': Some<&str>(&str) -> Option<&str>
1222 [108; 117) 'Some("x")': Option<&str> 1222 108..117 'Some("x")': Option<&str>
1223 [113; 116) '"x"': &str 1223 113..116 '"x"': &str
1224 [123; 135) 'Option::Some': Some<&str>(&str) -> Option<&str> 1224 123..135 'Option::Some': Some<&str>(&str) -> Option<&str>
1225 [123; 140) 'Option...e("x")': Option<&str> 1225 123..140 'Option...e("x")': Option<&str>
1226 [136; 139) '"x"': &str 1226 136..139 '"x"': &str
1227 [146; 150) 'None': Option<{unknown}> 1227 146..150 'None': Option<{unknown}>
1228 [160; 161) 'x': Option<i64> 1228 160..161 'x': Option<i64>
1229 [177; 181) 'None': Option<i64> 1229 177..181 'None': Option<i64>
1230 "### 1230 "###
1231 ); 1231 );
1232} 1232}
@@ -1244,20 +1244,20 @@ fn test() {
1244} 1244}
1245"#), 1245"#),
1246 @r###" 1246 @r###"
1247 [10; 11) 't': T 1247 10..11 't': T
1248 [21; 26) '{ t }': T 1248 21..26 '{ t }': T
1249 [23; 24) 't': T 1249 23..24 't': T
1250 [38; 98) '{ ...(1); }': () 1250 38..98 '{ ...(1); }': ()
1251 [44; 46) 'id': fn id<u32>(u32) -> u32 1251 44..46 'id': fn id<u32>(u32) -> u32
1252 [44; 52) 'id(1u32)': u32 1252 44..52 'id(1u32)': u32
1253 [47; 51) '1u32': u32 1253 47..51 '1u32': u32
1254 [58; 68) 'id::<i128>': fn id<i128>(i128) -> i128 1254 58..68 'id::<i128>': fn id<i128>(i128) -> i128
1255 [58; 71) 'id::<i128>(1)': i128 1255 58..71 'id::<i128>(1)': i128
1256 [69; 70) '1': i128 1256 69..70 '1': i128
1257 [81; 82) 'x': u64 1257 81..82 'x': u64
1258 [90; 92) 'id': fn id<u64>(u64) -> u64 1258 90..92 'id': fn id<u64>(u64) -> u64
1259 [90; 95) 'id(1)': u64 1259 90..95 'id(1)': u64
1260 [93; 94) '1': u64 1260 93..94 '1': u64
1261 "### 1261 "###
1262 ); 1262 );
1263} 1263}
@@ -1291,38 +1291,38 @@ fn test() -> i128 {
1291} 1291}
1292"#), 1292"#),
1293 @r###" 1293 @r###"
1294 [74; 78) 'self': A<X, Y> 1294 74..78 'self': A<X, Y>
1295 [85; 107) '{ ... }': X 1295 85..107 '{ ... }': X
1296 [95; 99) 'self': A<X, Y> 1296 95..99 'self': A<X, Y>
1297 [95; 101) 'self.x': X 1297 95..101 'self.x': X
1298 [117; 121) 'self': A<X, Y> 1298 117..121 'self': A<X, Y>
1299 [128; 150) '{ ... }': Y 1299 128..150 '{ ... }': Y
1300 [138; 142) 'self': A<X, Y> 1300 138..142 'self': A<X, Y>
1301 [138; 144) 'self.y': Y 1301 138..144 'self.y': Y
1302 [163; 167) 'self': A<X, Y> 1302 163..167 'self': A<X, Y>
1303 [169; 170) 't': T 1303 169..170 't': T
1304 [188; 223) '{ ... }': (X, Y, T) 1304 188..223 '{ ... }': (X, Y, T)
1305 [198; 217) '(self.....y, t)': (X, Y, T) 1305 198..217 '(self.....y, t)': (X, Y, T)
1306 [199; 203) 'self': A<X, Y> 1306 199..203 'self': A<X, Y>
1307 [199; 205) 'self.x': X 1307 199..205 'self.x': X
1308 [207; 211) 'self': A<X, Y> 1308 207..211 'self': A<X, Y>
1309 [207; 213) 'self.y': Y 1309 207..213 'self.y': Y
1310 [215; 216) 't': T 1310 215..216 't': T
1311 [245; 342) '{ ...(1); }': () 1311 245..342 '{ ...(1); }': ()
1312 [255; 256) 'a': A<u64, i64> 1312 255..256 'a': A<u64, i64>
1313 [259; 281) 'A { x:...1i64 }': A<u64, i64> 1313 259..281 'A { x:...1i64 }': A<u64, i64>
1314 [266; 270) '1u64': u64 1314 266..270 '1u64': u64
1315 [275; 279) '1i64': i64 1315 275..279 '1i64': i64
1316 [287; 288) 'a': A<u64, i64> 1316 287..288 'a': A<u64, i64>
1317 [287; 292) 'a.x()': u64 1317 287..292 'a.x()': u64
1318 [298; 299) 'a': A<u64, i64> 1318 298..299 'a': A<u64, i64>
1319 [298; 303) 'a.y()': i64 1319 298..303 'a.y()': i64
1320 [309; 310) 'a': A<u64, i64> 1320 309..310 'a': A<u64, i64>
1321 [309; 319) 'a.z(1i128)': (u64, i64, i128) 1321 309..319 'a.z(1i128)': (u64, i64, i128)
1322 [313; 318) '1i128': i128 1322 313..318 '1i128': i128
1323 [325; 326) 'a': A<u64, i64> 1323 325..326 'a': A<u64, i64>
1324 [325; 339) 'a.z::<u128>(1)': (u64, i64, u128) 1324 325..339 'a.z::<u128>(1)': (u64, i64, u128)
1325 [337; 338) '1': u128 1325 337..338 '1': u128
1326 "### 1326 "###
1327 ); 1327 );
1328} 1328}
@@ -1344,15 +1344,15 @@ fn test(o: Option<u32>) {
1344} 1344}
1345"#), 1345"#),
1346 @r###" 1346 @r###"
1347 [78; 82) 'self': &Option<T> 1347 78..82 'self': &Option<T>
1348 [98; 100) '{}': () 1348 98..100 '{}': ()
1349 [111; 112) 'o': Option<u32> 1349 111..112 'o': Option<u32>
1350 [127; 165) '{ ...f(); }': () 1350 127..165 '{ ...f(); }': ()
1351 [133; 146) '(&o).as_ref()': Option<&u32> 1351 133..146 '(&o).as_ref()': Option<&u32>
1352 [134; 136) '&o': &Option<u32> 1352 134..136 '&o': &Option<u32>
1353 [135; 136) 'o': Option<u32> 1353 135..136 'o': Option<u32>
1354 [152; 153) 'o': Option<u32> 1354 152..153 'o': Option<u32>
1355 [152; 162) 'o.as_ref()': Option<&u32> 1355 152..162 'o.as_ref()': Option<&u32>
1356 "### 1356 "###
1357 ); 1357 );
1358} 1358}
@@ -1381,35 +1381,35 @@ fn test() -> i128 {
1381} 1381}
1382"#), 1382"#),
1383 @r###" 1383 @r###"
1384 [53; 57) 'self': A<T2> 1384 53..57 'self': A<T2>
1385 [65; 87) '{ ... }': T2 1385 65..87 '{ ... }': T2
1386 [75; 79) 'self': A<T2> 1386 75..79 'self': A<T2>
1387 [75; 81) 'self.x': T2 1387 75..81 'self.x': T2
1388 [99; 100) 't': T 1388 99..100 't': T
1389 [110; 115) '{ t }': T 1389 110..115 '{ t }': T
1390 [112; 113) 't': T 1390 112..113 't': T
1391 [135; 261) '{ ....x() }': i128 1391 135..261 '{ ....x() }': i128
1392 [146; 147) 'x': i128 1392 146..147 'x': i128
1393 [150; 151) '1': i128 1393 150..151 '1': i128
1394 [162; 163) 'y': i128 1394 162..163 'y': i128
1395 [166; 168) 'id': fn id<i128>(i128) -> i128 1395 166..168 'id': fn id<i128>(i128) -> i128
1396 [166; 171) 'id(x)': i128 1396 166..171 'id(x)': i128
1397 [169; 170) 'x': i128 1397 169..170 'x': i128
1398 [182; 183) 'a': A<i128> 1398 182..183 'a': A<i128>
1399 [186; 200) 'A { x: id(y) }': A<i128> 1399 186..200 'A { x: id(y) }': A<i128>
1400 [193; 195) 'id': fn id<i128>(i128) -> i128 1400 193..195 'id': fn id<i128>(i128) -> i128
1401 [193; 198) 'id(y)': i128 1401 193..198 'id(y)': i128
1402 [196; 197) 'y': i128 1402 196..197 'y': i128
1403 [211; 212) 'z': i128 1403 211..212 'z': i128
1404 [215; 217) 'id': fn id<i128>(i128) -> i128 1404 215..217 'id': fn id<i128>(i128) -> i128
1405 [215; 222) 'id(a.x)': i128 1405 215..222 'id(a.x)': i128
1406 [218; 219) 'a': A<i128> 1406 218..219 'a': A<i128>
1407 [218; 221) 'a.x': i128 1407 218..221 'a.x': i128
1408 [233; 234) 'b': A<i128> 1408 233..234 'b': A<i128>
1409 [237; 247) 'A { x: z }': A<i128> 1409 237..247 'A { x: z }': A<i128>
1410 [244; 245) 'z': i128 1410 244..245 'z': i128
1411 [254; 255) 'b': A<i128> 1411 254..255 'b': A<i128>
1412 [254; 259) 'b.x()': i128 1412 254..259 'b.x()': i128
1413 "### 1413 "###
1414 ); 1414 );
1415} 1415}
@@ -1447,16 +1447,16 @@ fn test() {
1447} 1447}
1448"#), 1448"#),
1449 @r###" 1449 @r###"
1450 [52; 53) '1': u32 1450 52..53 '1': u32
1451 [105; 106) '2': u32 1451 105..106 '2': u32
1452 [213; 214) '5': u32 1452 213..214 '5': u32
1453 [229; 307) '{ ...:ID; }': () 1453 229..307 '{ ...:ID; }': ()
1454 [239; 240) 'x': u32 1454 239..240 'x': u32
1455 [243; 254) 'Struct::FOO': u32 1455 243..254 'Struct::FOO': u32
1456 [264; 265) 'y': u32 1456 264..265 'y': u32
1457 [268; 277) 'Enum::BAR': u32 1457 268..277 'Enum::BAR': u32
1458 [287; 288) 'z': u32 1458 287..288 'z': u32
1459 [291; 304) 'TraitTest::ID': u32 1459 291..304 'TraitTest::ID': u32
1460 "### 1460 "###
1461 ); 1461 );
1462} 1462}
@@ -1479,22 +1479,22 @@ fn test(x: Foo, y: Bar<&str>, z: Baz<i8, u8>) {
1479} 1479}
1480"#), 1480"#),
1481 @r###" 1481 @r###"
1482 [116; 117) 'x': A<u32, i128> 1482 116..117 'x': A<u32, i128>
1483 [124; 125) 'y': A<&str, u128> 1483 124..125 'y': A<&str, u128>
1484 [138; 139) 'z': A<u8, i8> 1484 138..139 'z': A<u8, i8>
1485 [154; 211) '{ ...z.y; }': () 1485 154..211 '{ ...z.y; }': ()
1486 [160; 161) 'x': A<u32, i128> 1486 160..161 'x': A<u32, i128>
1487 [160; 163) 'x.x': u32 1487 160..163 'x.x': u32
1488 [169; 170) 'x': A<u32, i128> 1488 169..170 'x': A<u32, i128>
1489 [169; 172) 'x.y': i128 1489 169..172 'x.y': i128
1490 [178; 179) 'y': A<&str, u128> 1490 178..179 'y': A<&str, u128>
1491 [178; 181) 'y.x': &str 1491 178..181 'y.x': &str
1492 [187; 188) 'y': A<&str, u128> 1492 187..188 'y': A<&str, u128>
1493 [187; 190) 'y.y': u128 1493 187..190 'y.y': u128
1494 [196; 197) 'z': A<u8, i8> 1494 196..197 'z': A<u8, i8>
1495 [196; 199) 'z.x': u8 1495 196..199 'z.x': u8
1496 [205; 206) 'z': A<u8, i8> 1496 205..206 'z': A<u8, i8>
1497 [205; 208) 'z.y': i8 1497 205..208 'z.y': i8
1498 "### 1498 "###
1499 ) 1499 )
1500} 1500}
@@ -1509,8 +1509,8 @@ type Bar = A<Bar>;
1509fn test(x: Foo) {} 1509fn test(x: Foo) {}
1510"#), 1510"#),
1511 @r###" 1511 @r###"
1512 [59; 60) 'x': {unknown} 1512 59..60 'x': {unknown}
1513 [67; 69) '{}': () 1513 67..69 '{}': ()
1514 "### 1514 "###
1515 ) 1515 )
1516} 1516}
@@ -1535,26 +1535,26 @@ fn test() {
1535} 1535}
1536"#), 1536"#),
1537 @r###" 1537 @r###"
1538 [10; 11) 'x': T 1538 10..11 'x': T
1539 [21; 30) '{ x }': T 1539 21..30 '{ x }': T
1540 [27; 28) 'x': T 1540 27..28 'x': T
1541 [44; 45) 'x': &T 1541 44..45 'x': &T
1542 [56; 66) '{ *x }': T 1542 56..66 '{ *x }': T
1543 [62; 64) '*x': T 1543 62..64 '*x': T
1544 [63; 64) 'x': &T 1544 63..64 'x': &T
1545 [78; 158) '{ ...(1); }': () 1545 78..158 '{ ...(1); }': ()
1546 [88; 89) 'y': u32 1546 88..89 'y': u32
1547 [92; 97) '10u32': u32 1547 92..97 '10u32': u32
1548 [103; 105) 'id': fn id<u32>(u32) -> u32 1548 103..105 'id': fn id<u32>(u32) -> u32
1549 [103; 108) 'id(y)': u32 1549 103..108 'id(y)': u32
1550 [106; 107) 'y': u32 1550 106..107 'y': u32
1551 [118; 119) 'x': bool 1551 118..119 'x': bool
1552 [128; 133) 'clone': fn clone<bool>(&bool) -> bool 1552 128..133 'clone': fn clone<bool>(&bool) -> bool
1553 [128; 136) 'clone(z)': bool 1553 128..136 'clone(z)': bool
1554 [134; 135) 'z': &bool 1554 134..135 'z': &bool
1555 [142; 152) 'id::<i128>': fn id<i128>(i128) -> i128 1555 142..152 'id::<i128>': fn id<i128>(i128) -> i128
1556 [142; 155) 'id::<i128>(1)': i128 1556 142..155 'id::<i128>(1)': i128
1557 [153; 154) '1': i128 1557 153..154 '1': i128
1558 "### 1558 "###
1559 ); 1559 );
1560} 1560}
@@ -1574,16 +1574,16 @@ fn test() {
1574} 1574}
1575"#), 1575"#),
1576 @r###" 1576 @r###"
1577 [49; 50) '0': u32 1577 49..50 '0': u32
1578 [80; 83) '101': u32 1578 80..83 '101': u32
1579 [95; 213) '{ ...NST; }': () 1579 95..213 '{ ...NST; }': ()
1580 [138; 139) 'x': u32 1580 138..139 'x': u32
1581 [142; 153) 'LOCAL_CONST': u32 1581 142..153 'LOCAL_CONST': u32
1582 [163; 164) 'z': u32 1582 163..164 'z': u32
1583 [167; 179) 'GLOBAL_CONST': u32 1583 167..179 'GLOBAL_CONST': u32
1584 [189; 191) 'id': u32 1584 189..191 'id': u32
1585 [194; 210) 'Foo::A..._CONST': u32 1585 194..210 'Foo::A..._CONST': u32
1586 [126; 128) '99': u32 1586 126..128 '99': u32
1587 "### 1587 "###
1588 ); 1588 );
1589} 1589}
@@ -1604,19 +1604,19 @@ fn test() {
1604} 1604}
1605"#), 1605"#),
1606 @r###" 1606 @r###"
1607 [29; 32) '101': u32 1607 29..32 '101': u32
1608 [70; 73) '101': u32 1608 70..73 '101': u32
1609 [85; 280) '{ ...MUT; }': () 1609 85..280 '{ ...MUT; }': ()
1610 [173; 174) 'x': u32 1610 173..174 'x': u32
1611 [177; 189) 'LOCAL_STATIC': u32 1611 177..189 'LOCAL_STATIC': u32
1612 [199; 200) 'y': u32 1612 199..200 'y': u32
1613 [203; 219) 'LOCAL_...IC_MUT': u32 1613 203..219 'LOCAL_...IC_MUT': u32
1614 [229; 230) 'z': u32 1614 229..230 'z': u32
1615 [233; 246) 'GLOBAL_STATIC': u32 1615 233..246 'GLOBAL_STATIC': u32
1616 [256; 257) 'w': u32 1616 256..257 'w': u32
1617 [260; 277) 'GLOBAL...IC_MUT': u32 1617 260..277 'GLOBAL...IC_MUT': u32
1618 [118; 120) '99': u32 1618 118..120 '99': u32
1619 [161; 163) '99': u32 1619 161..163 '99': u32
1620 "### 1620 "###
1621 ); 1621 );
1622} 1622}
@@ -1684,12 +1684,12 @@ fn foo() -> u32 {
1684} 1684}
1685"#), 1685"#),
1686 @r###" 1686 @r###"
1687 [17; 59) '{ ...; }; }': () 1687 17..59 '{ ...; }; }': ()
1688 [27; 28) 'x': || -> usize 1688 27..28 'x': || -> usize
1689 [31; 56) '|| -> ...n 1; }': || -> usize 1689 31..56 '|| -> ...n 1; }': || -> usize
1690 [43; 56) '{ return 1; }': ! 1690 43..56 '{ return 1; }': !
1691 [45; 53) 'return 1': ! 1691 45..53 'return 1': !
1692 [52; 53) '1': usize 1692 52..53 '1': usize
1693 "### 1693 "###
1694 ); 1694 );
1695} 1695}
@@ -1703,11 +1703,11 @@ fn foo() -> u32 {
1703} 1703}
1704"#), 1704"#),
1705 @r###" 1705 @r###"
1706 [17; 48) '{ ...; }; }': () 1706 17..48 '{ ...; }; }': ()
1707 [27; 28) 'x': || -> () 1707 27..28 'x': || -> ()
1708 [31; 45) '|| { return; }': || -> () 1708 31..45 '|| { return; }': || -> ()
1709 [34; 45) '{ return; }': ! 1709 34..45 '{ return; }': !
1710 [36; 42) 'return': ! 1710 36..42 'return': !
1711 "### 1711 "###
1712 ); 1712 );
1713} 1713}
@@ -1721,11 +1721,11 @@ fn foo() -> u32 {
1721} 1721}
1722"#), 1722"#),
1723 @r###" 1723 @r###"
1724 [17; 47) '{ ..." }; }': () 1724 17..47 '{ ..." }; }': ()
1725 [27; 28) 'x': || -> &str 1725 27..28 'x': || -> &str
1726 [31; 44) '|| { "test" }': || -> &str 1726 31..44 '|| { "test" }': || -> &str
1727 [34; 44) '{ "test" }': &str 1727 34..44 '{ "test" }': &str
1728 [36; 42) '"test"': &str 1728 36..42 '"test"': &str
1729 "### 1729 "###
1730 ); 1730 );
1731} 1731}
@@ -1744,14 +1744,14 @@ fn main() {
1744} 1744}
1745"#), 1745"#),
1746 @r###" 1746 @r###"
1747 [48; 121) '{ ...hod; }': () 1747 48..121 '{ ...hod; }': ()
1748 [58; 64) 'vtable': Vtable 1748 58..64 'vtable': Vtable
1749 [67; 91) 'Vtable...| {} }': Vtable 1749 67..91 'Vtable...| {} }': Vtable
1750 [84; 89) '|| {}': || -> () 1750 84..89 '|| {}': || -> ()
1751 [87; 89) '{}': () 1751 87..89 '{}': ()
1752 [101; 102) 'm': fn() 1752 101..102 'm': fn()
1753 [105; 111) 'vtable': Vtable 1753 105..111 'vtable': Vtable
1754 [105; 118) 'vtable.method': fn() 1754 105..118 'vtable.method': fn()
1755 "### 1755 "###
1756 ); 1756 );
1757} 1757}
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs
index a46f03b7f..f51cdd496 100644
--- a/crates/ra_hir_ty/src/tests/traits.rs
+++ b/crates/ra_hir_ty/src/tests/traits.rs
@@ -256,16 +256,16 @@ fn test() {
256} 256}
257"#), 257"#),
258 @r###" 258 @r###"
259 [86; 87) 't': T 259 86..87 't': T
260 [92; 94) '{}': () 260 92..94 '{}': ()
261 [105; 144) '{ ...(s); }': () 261 105..144 '{ ...(s); }': ()
262 [115; 116) 's': S<u32> 262 115..116 's': S<u32>
263 [119; 120) 'S': S<u32>(u32) -> S<u32> 263 119..120 'S': S<u32>(u32) -> S<u32>
264 [119; 129) 'S(unknown)': S<u32> 264 119..129 'S(unknown)': S<u32>
265 [121; 128) 'unknown': u32 265 121..128 'unknown': u32
266 [135; 138) 'foo': fn foo<S<u32>>(S<u32>) 266 135..138 'foo': fn foo<S<u32>>(S<u32>)
267 [135; 141) 'foo(s)': () 267 135..141 'foo(s)': ()
268 [139; 140) 's': S<u32> 268 139..140 's': S<u32>
269 "### 269 "###
270 ); 270 );
271} 271}
@@ -284,17 +284,17 @@ fn test() {
284} 284}
285"#), 285"#),
286 @r###" 286 @r###"
287 [87; 88) 't': T 287 87..88 't': T
288 [98; 100) '{}': () 288 98..100 '{}': ()
289 [111; 163) '{ ...(s); }': () 289 111..163 '{ ...(s); }': ()
290 [121; 122) 's': S<u32> 290 121..122 's': S<u32>
291 [125; 126) 'S': S<u32>(u32) -> S<u32> 291 125..126 'S': S<u32>(u32) -> S<u32>
292 [125; 135) 'S(unknown)': S<u32> 292 125..135 'S(unknown)': S<u32>
293 [127; 134) 'unknown': u32 293 127..134 'unknown': u32
294 [145; 146) 'x': u32 294 145..146 'x': u32
295 [154; 157) 'foo': fn foo<u32, S<u32>>(S<u32>) -> u32 295 154..157 'foo': fn foo<u32, S<u32>>(S<u32>) -> u32
296 [154; 160) 'foo(s)': u32 296 154..160 'foo(s)': u32
297 [158; 159) 's': S<u32> 297 158..159 's': S<u32>
298 "### 298 "###
299 ); 299 );
300} 300}
@@ -312,12 +312,12 @@ trait Trait {
312} 312}
313"#), 313"#),
314 @r###" 314 @r###"
315 [27; 31) 'self': &Self 315 27..31 'self': &Self
316 [53; 57) 'self': &Self 316 53..57 'self': &Self
317 [62; 97) '{ ... }': () 317 62..97 '{ ... }': ()
318 [76; 77) 'x': i64 318 76..77 'x': i64
319 [80; 84) 'self': &Self 319 80..84 'self': &Self
320 [80; 90) 'self.foo()': i64 320 80..90 'self.foo()': i64
321 "### 321 "###
322 ); 322 );
323} 323}
@@ -337,12 +337,12 @@ trait Trait: SuperTrait {
337} 337}
338"#), 338"#),
339 @r###" 339 @r###"
340 [32; 36) 'self': &Self 340 32..36 'self': &Self
341 [86; 90) 'self': &Self 341 86..90 'self': &Self
342 [95; 130) '{ ... }': () 342 95..130 '{ ... }': ()
343 [109; 110) 'x': i64 343 109..110 'x': i64
344 [113; 117) 'self': &Self 344 113..117 'self': &Self
345 [113; 123) 'self.foo()': i64 345 113..123 'self.foo()': i64
346 "### 346 "###
347 ); 347 );
348} 348}
@@ -364,15 +364,15 @@ fn test<T: Iterable>() {
364} 364}
365"#), 365"#),
366 @r###" 366 @r###"
367 [108; 261) '{ ...ter; }': () 367 108..261 '{ ...ter; }': ()
368 [118; 119) 'x': u32 368 118..119 'x': u32
369 [145; 146) '1': u32 369 145..146 '1': u32
370 [156; 157) 'y': Iterable::Item<T> 370 156..157 'y': Iterable::Item<T>
371 [183; 192) 'no_matter': Iterable::Item<T> 371 183..192 'no_matter': Iterable::Item<T>
372 [202; 203) 'z': Iterable::Item<T> 372 202..203 'z': Iterable::Item<T>
373 [215; 224) 'no_matter': Iterable::Item<T> 373 215..224 'no_matter': Iterable::Item<T>
374 [234; 235) 'a': Iterable::Item<T> 374 234..235 'a': Iterable::Item<T>
375 [249; 258) 'no_matter': Iterable::Item<T> 375 249..258 'no_matter': Iterable::Item<T>
376 "### 376 "###
377 ); 377 );
378} 378}
@@ -396,25 +396,25 @@ fn test() {
396} 396}
397"#), 397"#),
398 @r###" 398 @r###"
399 [106; 107) 't': T 399 106..107 't': T
400 [123; 125) '{}': () 400 123..125 '{}': ()
401 [147; 148) 't': T 401 147..148 't': T
402 [178; 180) '{}': () 402 178..180 '{}': ()
403 [202; 203) 't': T 403 202..203 't': T
404 [221; 223) '{}': () 404 221..223 '{}': ()
405 [234; 300) '{ ...(S); }': () 405 234..300 '{ ...(S); }': ()
406 [244; 245) 'x': u32 406 244..245 'x': u32
407 [248; 252) 'foo1': fn foo1<S>(S) -> <S as Iterable>::Item 407 248..252 'foo1': fn foo1<S>(S) -> <S as Iterable>::Item
408 [248; 255) 'foo1(S)': u32 408 248..255 'foo1(S)': u32
409 [253; 254) 'S': S 409 253..254 'S': S
410 [265; 266) 'y': u32 410 265..266 'y': u32
411 [269; 273) 'foo2': fn foo2<S>(S) -> <S as Iterable>::Item 411 269..273 'foo2': fn foo2<S>(S) -> <S as Iterable>::Item
412 [269; 276) 'foo2(S)': u32 412 269..276 'foo2(S)': u32
413 [274; 275) 'S': S 413 274..275 'S': S
414 [286; 287) 'z': u32 414 286..287 'z': u32
415 [290; 294) 'foo3': fn foo3<S>(S) -> <S as Iterable>::Item 415 290..294 'foo3': fn foo3<S>(S) -> <S as Iterable>::Item
416 [290; 297) 'foo3(S)': u32 416 290..297 'foo3(S)': u32
417 [295; 296) 'S': S 417 295..296 'S': S
418 "### 418 "###
419 ); 419 );
420} 420}
@@ -431,9 +431,9 @@ fn test<T: Iterable<Item=u32>>() {
431} 431}
432"#), 432"#),
433 @r###" 433 @r###"
434 [67; 100) '{ ...own; }': () 434 67..100 '{ ...own; }': ()
435 [77; 78) 'y': u32 435 77..78 'y': u32
436 [90; 97) 'unknown': u32 436 90..97 'unknown': u32
437 "### 437 "###
438 ); 438 );
439} 439}
@@ -446,13 +446,13 @@ const A: u32 = 1 + 1;
446static B: u64 = { let x = 1; x }; 446static B: u64 = { let x = 1; x };
447"#), 447"#),
448 @r###" 448 @r###"
449 [16; 17) '1': u32 449 16..17 '1': u32
450 [16; 21) '1 + 1': u32 450 16..21 '1 + 1': u32
451 [20; 21) '1': u32 451 20..21 '1': u32
452 [39; 55) '{ let ...1; x }': u64 452 39..55 '{ let ...1; x }': u64
453 [45; 46) 'x': u64 453 45..46 'x': u64
454 [49; 50) '1': u64 454 49..50 '1': u64
455 [52; 53) 'x': u64 455 52..53 'x': u64
456 "### 456 "###
457 ); 457 );
458} 458}
@@ -469,17 +469,17 @@ fn test() -> u64 {
469} 469}
470"#), 470"#),
471 @r###" 471 @r###"
472 [38; 87) '{ ... a.1 }': u64 472 38..87 '{ ... a.1 }': u64
473 [48; 49) 'a': S 473 48..49 'a': S
474 [52; 53) 'S': S(i32, u64) -> S 474 52..53 'S': S(i32, u64) -> S
475 [52; 59) 'S(4, 6)': S 475 52..59 'S(4, 6)': S
476 [54; 55) '4': i32 476 54..55 '4': i32
477 [57; 58) '6': u64 477 57..58 '6': u64
478 [69; 70) 'b': i32 478 69..70 'b': i32
479 [73; 74) 'a': S 479 73..74 'a': S
480 [73; 76) 'a.0': i32 480 73..76 'a.0': i32
481 [82; 83) 'a': S 481 82..83 'a': S
482 [82; 85) 'a.1': u64 482 82..85 'a.1': u64
483 "### 483 "###
484 ); 484 );
485} 485}
@@ -496,24 +496,24 @@ fn test() -> u64 {
496} 496}
497"#), 497"#),
498 @r###" 498 @r###"
499 [44; 102) '{ ...0(2) }': u64 499 44..102 '{ ...0(2) }': u64
500 [54; 55) 'a': S 500 54..55 'a': S
501 [58; 59) 'S': S(fn(u32) -> u64) -> S 501 58..59 'S': S(fn(u32) -> u64) -> S
502 [58; 68) 'S(|i| 2*i)': S 502 58..68 'S(|i| 2*i)': S
503 [60; 67) '|i| 2*i': |u32| -> u64 503 60..67 '|i| 2*i': |u32| -> u64
504 [61; 62) 'i': u32 504 61..62 'i': u32
505 [64; 65) '2': u32 505 64..65 '2': u32
506 [64; 67) '2*i': u32 506 64..67 '2*i': u32
507 [66; 67) 'i': u32 507 66..67 'i': u32
508 [78; 79) 'b': u64 508 78..79 'b': u64
509 [82; 83) 'a': S 509 82..83 'a': S
510 [82; 85) 'a.0': fn(u32) -> u64 510 82..85 'a.0': fn(u32) -> u64
511 [82; 88) 'a.0(4)': u64 511 82..88 'a.0(4)': u64
512 [86; 87) '4': u32 512 86..87 '4': u32
513 [94; 95) 'a': S 513 94..95 'a': S
514 [94; 97) 'a.0': fn(u32) -> u64 514 94..97 'a.0': fn(u32) -> u64
515 [94; 100) 'a.0(2)': u64 515 94..100 'a.0(2)': u64
516 [98; 99) '2': u32 516 98..99 '2': u32
517 "### 517 "###
518 ); 518 );
519} 519}
@@ -523,12 +523,12 @@ fn indexing_arrays() {
523 assert_snapshot!( 523 assert_snapshot!(
524 infer("fn main() { &mut [9][2]; }"), 524 infer("fn main() { &mut [9][2]; }"),
525 @r###" 525 @r###"
526 [10; 26) '{ &mut...[2]; }': () 526 10..26 '{ &mut...[2]; }': ()
527 [12; 23) '&mut [9][2]': &mut {unknown} 527 12..23 '&mut [9][2]': &mut {unknown}
528 [17; 20) '[9]': [i32; _] 528 17..20 '[9]': [i32; _]
529 [17; 23) '[9][2]': {unknown} 529 17..23 '[9][2]': {unknown}
530 [18; 19) '9': i32 530 18..19 '9': i32
531 [21; 22) '2': i32 531 21..22 '2': i32
532 "### 532 "###
533 ) 533 )
534} 534}
@@ -944,34 +944,34 @@ fn test(x: impl Trait<u64>, y: &impl Trait<u32>) {
944} 944}
945"#, true), 945"#, true),
946 @r###" 946 @r###"
947 [30; 34) 'self': &Self 947 30..34 'self': &Self
948 [55; 59) 'self': &Self 948 55..59 'self': &Self
949 [78; 79) 'x': impl Trait<u16> 949 78..79 'x': impl Trait<u16>
950 [98; 100) '{}': () 950 98..100 '{}': ()
951 [155; 156) 'x': impl Trait<u64> 951 155..156 'x': impl Trait<u64>
952 [175; 176) 'y': &impl Trait<u32> 952 175..176 'y': &impl Trait<u32>
953 [196; 324) '{ ...2(); }': () 953 196..324 '{ ...2(); }': ()
954 [202; 203) 'x': impl Trait<u64> 954 202..203 'x': impl Trait<u64>
955 [209; 210) 'y': &impl Trait<u32> 955 209..210 'y': &impl Trait<u32>
956 [220; 221) 'z': S<u16> 956 220..221 'z': S<u16>
957 [224; 225) 'S': S<u16>(u16) -> S<u16> 957 224..225 'S': S<u16>(u16) -> S<u16>
958 [224; 228) 'S(1)': S<u16> 958 224..228 'S(1)': S<u16>
959 [226; 227) '1': u16 959 226..227 '1': u16
960 [234; 237) 'bar': fn bar(S<u16>) 960 234..237 'bar': fn bar(S<u16>)
961 [234; 240) 'bar(z)': () 961 234..240 'bar(z)': ()
962 [238; 239) 'z': S<u16> 962 238..239 'z': S<u16>
963 [246; 247) 'x': impl Trait<u64> 963 246..247 'x': impl Trait<u64>
964 [246; 253) 'x.foo()': u64 964 246..253 'x.foo()': u64
965 [259; 260) 'y': &impl Trait<u32> 965 259..260 'y': &impl Trait<u32>
966 [259; 266) 'y.foo()': u32 966 259..266 'y.foo()': u32
967 [272; 273) 'z': S<u16> 967 272..273 'z': S<u16>
968 [272; 279) 'z.foo()': u16 968 272..279 'z.foo()': u16
969 [285; 286) 'x': impl Trait<u64> 969 285..286 'x': impl Trait<u64>
970 [285; 293) 'x.foo2()': i64 970 285..293 'x.foo2()': i64
971 [299; 300) 'y': &impl Trait<u32> 971 299..300 'y': &impl Trait<u32>
972 [299; 307) 'y.foo2()': i64 972 299..307 'y.foo2()': i64
973 [313; 314) 'z': S<u16> 973 313..314 'z': S<u16>
974 [313; 321) 'z.foo2()': i64 974 313..321 'z.foo2()': i64
975 "### 975 "###
976 ); 976 );
977} 977}
@@ -1005,39 +1005,39 @@ fn test() {
1005} 1005}
1006"#, true), 1006"#, true),
1007 @r###" 1007 @r###"
1008 [156; 157) 'x': impl Trait 1008 156..157 'x': impl Trait
1009 [176; 187) '{ loop {} }': T 1009 176..187 '{ loop {} }': T
1010 [178; 185) 'loop {}': ! 1010 178..185 'loop {}': !
1011 [183; 185) '{}': () 1011 183..185 '{}': ()
1012 [200; 201) 'x': impl Trait 1012 200..201 'x': impl Trait
1013 [220; 231) '{ loop {} }': T 1013 220..231 '{ loop {} }': T
1014 [222; 229) 'loop {}': ! 1014 222..229 'loop {}': !
1015 [227; 229) '{}': () 1015 227..229 '{}': ()
1016 [301; 510) '{ ... i32 }': () 1016 301..510 '{ ... i32 }': ()
1017 [307; 315) 'Foo::bar': fn bar<{unknown}, {unknown}>(S) -> {unknown} 1017 307..315 'Foo::bar': fn bar<{unknown}, {unknown}>(S) -> {unknown}
1018 [307; 318) 'Foo::bar(S)': {unknown} 1018 307..318 'Foo::bar(S)': {unknown}
1019 [316; 317) 'S': S 1019 316..317 'S': S
1020 [324; 339) '<F as Foo>::bar': fn bar<F, {unknown}>(S) -> {unknown} 1020 324..339 '<F as Foo>::bar': fn bar<F, {unknown}>(S) -> {unknown}
1021 [324; 342) '<F as ...bar(S)': {unknown} 1021 324..342 '<F as ...bar(S)': {unknown}
1022 [340; 341) 'S': S 1022 340..341 'S': S
1023 [348; 354) 'F::bar': fn bar<F, {unknown}>(S) -> {unknown} 1023 348..354 'F::bar': fn bar<F, {unknown}>(S) -> {unknown}
1024 [348; 357) 'F::bar(S)': {unknown} 1024 348..357 'F::bar(S)': {unknown}
1025 [355; 356) 'S': S 1025 355..356 'S': S
1026 [363; 378) 'Foo::bar::<u32>': fn bar<{unknown}, u32>(S) -> u32 1026 363..378 'Foo::bar::<u32>': fn bar<{unknown}, u32>(S) -> u32
1027 [363; 381) 'Foo::b...32>(S)': u32 1027 363..381 'Foo::b...32>(S)': u32
1028 [379; 380) 'S': S 1028 379..380 'S': S
1029 [387; 409) '<F as ...:<u32>': fn bar<F, u32>(S) -> u32 1029 387..409 '<F as ...:<u32>': fn bar<F, u32>(S) -> u32
1030 [387; 412) '<F as ...32>(S)': u32 1030 387..412 '<F as ...32>(S)': u32
1031 [410; 411) 'S': S 1031 410..411 'S': S
1032 [419; 422) 'foo': fn foo<{unknown}>(S) -> {unknown} 1032 419..422 'foo': fn foo<{unknown}>(S) -> {unknown}
1033 [419; 425) 'foo(S)': {unknown} 1033 419..425 'foo(S)': {unknown}
1034 [423; 424) 'S': S 1034 423..424 'S': S
1035 [431; 441) 'foo::<u32>': fn foo<u32>(S) -> u32 1035 431..441 'foo::<u32>': fn foo<u32>(S) -> u32
1036 [431; 444) 'foo::<u32>(S)': u32 1036 431..444 'foo::<u32>(S)': u32
1037 [442; 443) 'S': S 1037 442..443 'S': S
1038 [450; 465) 'foo::<u32, i32>': fn foo<u32>(S) -> u32 1038 450..465 'foo::<u32, i32>': fn foo<u32>(S) -> u32
1039 [450; 468) 'foo::<...32>(S)': u32 1039 450..468 'foo::<...32>(S)': u32
1040 [466; 467) 'S': S 1040 466..467 'S': S
1041 "### 1041 "###
1042 ); 1042 );
1043} 1043}
@@ -1062,24 +1062,24 @@ fn test() {
1062} 1062}
1063"#, true), 1063"#, true),
1064 @r###" 1064 @r###"
1065 [88; 92) 'self': F<T> 1065 88..92 'self': F<T>
1066 [94; 95) 'x': impl Trait 1066 94..95 'x': impl Trait
1067 [119; 130) '{ loop {} }': (T, U) 1067 119..130 '{ loop {} }': (T, U)
1068 [121; 128) 'loop {}': ! 1068 121..128 'loop {}': !
1069 [126; 128) '{}': () 1069 126..128 '{}': ()
1070 [144; 284) '{ ...ored }': () 1070 144..284 '{ ...ored }': ()
1071 [150; 151) 'F': F<{unknown}> 1071 150..151 'F': F<{unknown}>
1072 [150; 158) 'F.foo(S)': ({unknown}, {unknown}) 1072 150..158 'F.foo(S)': ({unknown}, {unknown})
1073 [156; 157) 'S': S 1073 156..157 'S': S
1074 [164; 172) 'F::<u32>': F<u32> 1074 164..172 'F::<u32>': F<u32>
1075 [164; 179) 'F::<u32>.foo(S)': (u32, {unknown}) 1075 164..179 'F::<u32>.foo(S)': (u32, {unknown})
1076 [177; 178) 'S': S 1076 177..178 'S': S
1077 [185; 193) 'F::<u32>': F<u32> 1077 185..193 'F::<u32>': F<u32>
1078 [185; 207) 'F::<u3...32>(S)': (u32, i32) 1078 185..207 'F::<u3...32>(S)': (u32, i32)
1079 [205; 206) 'S': S 1079 205..206 'S': S
1080 [213; 221) 'F::<u32>': F<u32> 1080 213..221 'F::<u32>': F<u32>
1081 [213; 240) 'F::<u3...32>(S)': (u32, i32) 1081 213..240 'F::<u3...32>(S)': (u32, i32)
1082 [238; 239) 'S': S 1082 238..239 'S': S
1083 "### 1083 "###
1084 ); 1084 );
1085} 1085}
@@ -1098,13 +1098,13 @@ fn test() {
1098} 1098}
1099"#, true), 1099"#, true),
1100 @r###" 1100 @r###"
1101 [23; 24) 'x': impl Trait 1101 23..24 'x': impl Trait
1102 [38; 49) '{ loop {} }': () 1102 38..49 '{ loop {} }': ()
1103 [40; 47) 'loop {}': ! 1103 40..47 'loop {}': !
1104 [45; 47) '{}': () 1104 45..47 '{}': ()
1105 [91; 124) '{ ...foo; }': () 1105 91..124 '{ ...foo; }': ()
1106 [101; 102) 'f': fn(S) 1106 101..102 'f': fn(S)
1107 [118; 121) 'foo': fn foo(S) 1107 118..121 'foo': fn foo(S)
1108 "### 1108 "###
1109 ); 1109 );
1110} 1110}
@@ -1133,29 +1133,29 @@ fn test(x: impl Trait<u64>, y: &impl Trait<u64>) {
1133} 1133}
1134"#), 1134"#),
1135 @r###" 1135 @r###"
1136 [30; 34) 'self': &Self 1136 30..34 'self': &Self
1137 [55; 59) 'self': &Self 1137 55..59 'self': &Self
1138 [99; 101) '{}': () 1138 99..101 '{}': ()
1139 [111; 112) 'x': impl Trait<u64> 1139 111..112 'x': impl Trait<u64>
1140 [131; 132) 'y': &impl Trait<u64> 1140 131..132 'y': &impl Trait<u64>
1141 [152; 269) '{ ...2(); }': () 1141 152..269 '{ ...2(); }': ()
1142 [158; 159) 'x': impl Trait<u64> 1142 158..159 'x': impl Trait<u64>
1143 [165; 166) 'y': &impl Trait<u64> 1143 165..166 'y': &impl Trait<u64>
1144 [176; 177) 'z': impl Trait<u64> 1144 176..177 'z': impl Trait<u64>
1145 [180; 183) 'bar': fn bar() -> impl Trait<u64> 1145 180..183 'bar': fn bar() -> impl Trait<u64>
1146 [180; 185) 'bar()': impl Trait<u64> 1146 180..185 'bar()': impl Trait<u64>
1147 [191; 192) 'x': impl Trait<u64> 1147 191..192 'x': impl Trait<u64>
1148 [191; 198) 'x.foo()': u64 1148 191..198 'x.foo()': u64
1149 [204; 205) 'y': &impl Trait<u64> 1149 204..205 'y': &impl Trait<u64>
1150 [204; 211) 'y.foo()': u64 1150 204..211 'y.foo()': u64
1151 [217; 218) 'z': impl Trait<u64> 1151 217..218 'z': impl Trait<u64>
1152 [217; 224) 'z.foo()': u64 1152 217..224 'z.foo()': u64
1153 [230; 231) 'x': impl Trait<u64> 1153 230..231 'x': impl Trait<u64>
1154 [230; 238) 'x.foo2()': i64 1154 230..238 'x.foo2()': i64
1155 [244; 245) 'y': &impl Trait<u64> 1155 244..245 'y': &impl Trait<u64>
1156 [244; 252) 'y.foo2()': i64 1156 244..252 'y.foo2()': i64
1157 [258; 259) 'z': impl Trait<u64> 1157 258..259 'z': impl Trait<u64>
1158 [258; 266) 'z.foo2()': i64 1158 258..266 'z.foo2()': i64
1159 "### 1159 "###
1160 ); 1160 );
1161} 1161}
@@ -1183,29 +1183,29 @@ fn test(x: dyn Trait<u64>, y: &dyn Trait<u64>) {
1183} 1183}
1184"#), 1184"#),
1185 @r###" 1185 @r###"
1186 [30; 34) 'self': &Self 1186 30..34 'self': &Self
1187 [55; 59) 'self': &Self 1187 55..59 'self': &Self
1188 [98; 100) '{}': () 1188 98..100 '{}': ()
1189 [110; 111) 'x': dyn Trait<u64> 1189 110..111 'x': dyn Trait<u64>
1190 [129; 130) 'y': &dyn Trait<u64> 1190 129..130 'y': &dyn Trait<u64>
1191 [149; 266) '{ ...2(); }': () 1191 149..266 '{ ...2(); }': ()
1192 [155; 156) 'x': dyn Trait<u64> 1192 155..156 'x': dyn Trait<u64>
1193 [162; 163) 'y': &dyn Trait<u64> 1193 162..163 'y': &dyn Trait<u64>
1194 [173; 174) 'z': dyn Trait<u64> 1194 173..174 'z': dyn Trait<u64>
1195 [177; 180) 'bar': fn bar() -> dyn Trait<u64> 1195 177..180 'bar': fn bar() -> dyn Trait<u64>
1196 [177; 182) 'bar()': dyn Trait<u64> 1196 177..182 'bar()': dyn Trait<u64>
1197 [188; 189) 'x': dyn Trait<u64> 1197 188..189 'x': dyn Trait<u64>
1198 [188; 195) 'x.foo()': u64 1198 188..195 'x.foo()': u64
1199 [201; 202) 'y': &dyn Trait<u64> 1199 201..202 'y': &dyn Trait<u64>
1200 [201; 208) 'y.foo()': u64 1200 201..208 'y.foo()': u64
1201 [214; 215) 'z': dyn Trait<u64> 1201 214..215 'z': dyn Trait<u64>
1202 [214; 221) 'z.foo()': u64 1202 214..221 'z.foo()': u64
1203 [227; 228) 'x': dyn Trait<u64> 1203 227..228 'x': dyn Trait<u64>
1204 [227; 235) 'x.foo2()': i64 1204 227..235 'x.foo2()': i64
1205 [241; 242) 'y': &dyn Trait<u64> 1205 241..242 'y': &dyn Trait<u64>
1206 [241; 249) 'y.foo2()': i64 1206 241..249 'y.foo2()': i64
1207 [255; 256) 'z': dyn Trait<u64> 1207 255..256 'z': dyn Trait<u64>
1208 [255; 263) 'z.foo2()': i64 1208 255..263 'z.foo2()': i64
1209 "### 1209 "###
1210 ); 1210 );
1211} 1211}
@@ -1231,17 +1231,17 @@ fn test(s: S<u32, i32>) {
1231} 1231}
1232"#), 1232"#),
1233 @r###" 1233 @r###"
1234 [33; 37) 'self': &Self 1234 33..37 'self': &Self
1235 [103; 107) 'self': &S<T, U> 1235 103..107 'self': &S<T, U>
1236 [129; 140) '{ loop {} }': &dyn Trait<T, U> 1236 129..140 '{ loop {} }': &dyn Trait<T, U>
1237 [131; 138) 'loop {}': ! 1237 131..138 'loop {}': !
1238 [136; 138) '{}': () 1238 136..138 '{}': ()
1239 [176; 180) 'self': &Self 1239 176..180 'self': &Self
1240 [252; 253) 's': S<u32, i32> 1240 252..253 's': S<u32, i32>
1241 [268; 290) '{ ...z(); }': () 1241 268..290 '{ ...z(); }': ()
1242 [274; 275) 's': S<u32, i32> 1242 274..275 's': S<u32, i32>
1243 [274; 281) 's.bar()': &dyn Trait<u32, i32> 1243 274..281 's.bar()': &dyn Trait<u32, i32>
1244 [274; 287) 's.bar().baz()': (u32, i32) 1244 274..287 's.bar().baz()': (u32, i32)
1245 "### 1245 "###
1246 ); 1246 );
1247} 1247}
@@ -1265,22 +1265,22 @@ fn test(x: Trait, y: &Trait) -> u64 {
1265} 1265}
1266"#), 1266"#),
1267 @r###" 1267 @r###"
1268 [27; 31) 'self': &Self 1268 27..31 'self': &Self
1269 [61; 63) '{}': () 1269 61..63 '{}': ()
1270 [73; 74) 'x': dyn Trait 1270 73..74 'x': dyn Trait
1271 [83; 84) 'y': &dyn Trait 1271 83..84 'y': &dyn Trait
1272 [101; 176) '{ ...o(); }': () 1272 101..176 '{ ...o(); }': ()
1273 [107; 108) 'x': dyn Trait 1273 107..108 'x': dyn Trait
1274 [114; 115) 'y': &dyn Trait 1274 114..115 'y': &dyn Trait
1275 [125; 126) 'z': dyn Trait 1275 125..126 'z': dyn Trait
1276 [129; 132) 'bar': fn bar() -> dyn Trait 1276 129..132 'bar': fn bar() -> dyn Trait
1277 [129; 134) 'bar()': dyn Trait 1277 129..134 'bar()': dyn Trait
1278 [140; 141) 'x': dyn Trait 1278 140..141 'x': dyn Trait
1279 [140; 147) 'x.foo()': u64 1279 140..147 'x.foo()': u64
1280 [153; 154) 'y': &dyn Trait 1280 153..154 'y': &dyn Trait
1281 [153; 160) 'y.foo()': u64 1281 153..160 'y.foo()': u64
1282 [166; 167) 'z': dyn Trait 1282 166..167 'z': dyn Trait
1283 [166; 173) 'z.foo()': u64 1283 166..173 'z.foo()': u64
1284 "### 1284 "###
1285 ); 1285 );
1286} 1286}
@@ -1294,13 +1294,13 @@ fn test(a: impl Trait + 'lifetime, b: impl 'lifetime, c: impl (Trait), d: impl (
1294} 1294}
1295"#), 1295"#),
1296 @r###" 1296 @r###"
1297 [24; 25) 'a': impl Trait + {error} 1297 24..25 'a': impl Trait + {error}
1298 [51; 52) 'b': impl {error} 1298 51..52 'b': impl {error}
1299 [70; 71) 'c': impl Trait 1299 70..71 'c': impl Trait
1300 [87; 88) 'd': impl {error} 1300 87..88 'd': impl {error}
1301 [108; 109) 'e': impl {error} 1301 108..109 'e': impl {error}
1302 [124; 125) 'f': impl Trait + {error} 1302 124..125 'f': impl Trait + {error}
1303 [148; 151) '{ }': () 1303 148..151 '{ }': ()
1304 "### 1304 "###
1305 ); 1305 );
1306} 1306}
@@ -1349,41 +1349,41 @@ fn test<T: Trait<Type = u32>>(x: T, y: impl Trait<Type = i64>) {
1349} 1349}
1350"#), 1350"#),
1351 @r###" 1351 @r###"
1352 [50; 51) 't': T 1352 50..51 't': T
1353 [78; 80) '{}': () 1353 78..80 '{}': ()
1354 [112; 113) 't': T 1354 112..113 't': T
1355 [123; 125) '{}': () 1355 123..125 '{}': ()
1356 [155; 156) 't': T 1356 155..156 't': T
1357 [166; 169) '{t}': T 1357 166..169 '{t}': T
1358 [167; 168) 't': T 1358 167..168 't': T
1359 [257; 258) 'x': T 1359 257..258 'x': T
1360 [263; 264) 'y': impl Trait<Type = i64> 1360 263..264 'y': impl Trait<Type = i64>
1361 [290; 398) '{ ...r>); }': () 1361 290..398 '{ ...r>); }': ()
1362 [296; 299) 'get': fn get<T>(T) -> <T as Trait>::Type 1362 296..299 'get': fn get<T>(T) -> <T as Trait>::Type
1363 [296; 302) 'get(x)': u32 1363 296..302 'get(x)': u32
1364 [300; 301) 'x': T 1364 300..301 'x': T
1365 [308; 312) 'get2': fn get2<u32, T>(T) -> u32 1365 308..312 'get2': fn get2<u32, T>(T) -> u32
1366 [308; 315) 'get2(x)': u32 1366 308..315 'get2(x)': u32
1367 [313; 314) 'x': T 1367 313..314 'x': T
1368 [321; 324) 'get': fn get<impl Trait<Type = i64>>(impl Trait<Type = i64>) -> <impl Trait<Type = i64> as Trait>::Type 1368 321..324 'get': fn get<impl Trait<Type = i64>>(impl Trait<Type = i64>) -> <impl Trait<Type = i64> as Trait>::Type
1369 [321; 327) 'get(y)': i64 1369 321..327 'get(y)': i64
1370 [325; 326) 'y': impl Trait<Type = i64> 1370 325..326 'y': impl Trait<Type = i64>
1371 [333; 337) 'get2': fn get2<i64, impl Trait<Type = i64>>(impl Trait<Type = i64>) -> i64 1371 333..337 'get2': fn get2<i64, impl Trait<Type = i64>>(impl Trait<Type = i64>) -> i64
1372 [333; 340) 'get2(y)': i64 1372 333..340 'get2(y)': i64
1373 [338; 339) 'y': impl Trait<Type = i64> 1373 338..339 'y': impl Trait<Type = i64>
1374 [346; 349) 'get': fn get<S<u64>>(S<u64>) -> <S<u64> as Trait>::Type 1374 346..349 'get': fn get<S<u64>>(S<u64>) -> <S<u64> as Trait>::Type
1375 [346; 357) 'get(set(S))': u64 1375 346..357 'get(set(S))': u64
1376 [350; 353) 'set': fn set<S<u64>>(S<u64>) -> S<u64> 1376 350..353 'set': fn set<S<u64>>(S<u64>) -> S<u64>
1377 [350; 356) 'set(S)': S<u64> 1377 350..356 'set(S)': S<u64>
1378 [354; 355) 'S': S<u64> 1378 354..355 'S': S<u64>
1379 [363; 367) 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64 1379 363..367 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
1380 [363; 375) 'get2(set(S))': u64 1380 363..375 'get2(set(S))': u64
1381 [368; 371) 'set': fn set<S<u64>>(S<u64>) -> S<u64> 1381 368..371 'set': fn set<S<u64>>(S<u64>) -> S<u64>
1382 [368; 374) 'set(S)': S<u64> 1382 368..374 'set(S)': S<u64>
1383 [372; 373) 'S': S<u64> 1383 372..373 'S': S<u64>
1384 [381; 385) 'get2': fn get2<str, S<str>>(S<str>) -> str 1384 381..385 'get2': fn get2<str, S<str>>(S<str>) -> str
1385 [381; 395) 'get2(S::<str>)': str 1385 381..395 'get2(S::<str>)': str
1386 [386; 394) 'S::<str>': S<str> 1386 386..394 'S::<str>': S<str>
1387 "### 1387 "###
1388 ); 1388 );
1389} 1389}
@@ -1448,11 +1448,11 @@ fn test<T: Trait1<Type = u32>>(x: T) {
1448} 1448}
1449"#), 1449"#),
1450 @r###" 1450 @r###"
1451 [62; 66) 'self': Self 1451 62..66 'self': Self
1452 [164; 165) 'x': T 1452 164..165 'x': T
1453 [170; 186) '{ ...o(); }': () 1453 170..186 '{ ...o(); }': ()
1454 [176; 177) 'x': T 1454 176..177 'x': T
1455 [176; 183) 'x.foo()': u32 1455 176..183 'x.foo()': u32
1456 "### 1456 "###
1457 ); 1457 );
1458} 1458}
@@ -1494,15 +1494,15 @@ fn test<T: Trait1, U: Trait2>(x: T, y: U) {
1494} 1494}
1495"#), 1495"#),
1496 @r###" 1496 @r###"
1497 [50; 54) 'self': &Self 1497 50..54 'self': &Self
1498 [63; 65) '{}': () 1498 63..65 '{}': ()
1499 [182; 183) 'x': T 1499 182..183 'x': T
1500 [188; 189) 'y': U 1500 188..189 'y': U
1501 [194; 223) '{ ...o(); }': () 1501 194..223 '{ ...o(); }': ()
1502 [200; 201) 'x': T 1502 200..201 'x': T
1503 [200; 207) 'x.foo()': u32 1503 200..207 'x.foo()': u32
1504 [213; 214) 'y': U 1504 213..214 'y': U
1505 [213; 220) 'y.foo()': u32 1505 213..220 'y.foo()': u32
1506 "### 1506 "###
1507 ); 1507 );
1508} 1508}
@@ -1523,12 +1523,12 @@ fn test(x: &impl Trait1) {
1523} 1523}
1524"#), 1524"#),
1525 @r###" 1525 @r###"
1526 [50; 54) 'self': &Self 1526 50..54 'self': &Self
1527 [63; 65) '{}': () 1527 63..65 '{}': ()
1528 [116; 117) 'x': &impl Trait1 1528 116..117 'x': &impl Trait1
1529 [133; 149) '{ ...o(); }': () 1529 133..149 '{ ...o(); }': ()
1530 [139; 140) 'x': &impl Trait1 1530 139..140 'x': &impl Trait1
1531 [139; 146) 'x.foo()': u32 1531 139..146 'x.foo()': u32
1532 "### 1532 "###
1533 ); 1533 );
1534} 1534}
@@ -1546,10 +1546,10 @@ fn test<T: A>(x: T) {
1546} 1546}
1547"#), 1547"#),
1548 @r###" 1548 @r###"
1549 [44; 45) 'x': T 1549 44..45 'x': T
1550 [50; 66) '{ ...o(); }': () 1550 50..66 '{ ...o(); }': ()
1551 [56; 57) 'x': T 1551 56..57 'x': T
1552 [56; 63) 'x.foo()': {unknown} 1552 56..63 'x.foo()': {unknown}
1553 "### 1553 "###
1554 ); 1554 );
1555} 1555}
@@ -1573,17 +1573,17 @@ fn test() {
1573} 1573}
1574"#), 1574"#),
1575 @r###" 1575 @r###"
1576 [103; 104) 't': T 1576 103..104 't': T
1577 [114; 116) '{}': () 1577 114..116 '{}': ()
1578 [146; 147) 't': T 1578 146..147 't': T
1579 [157; 160) '{t}': T 1579 157..160 '{t}': T
1580 [158; 159) 't': T 1580 158..159 't': T
1581 [259; 280) '{ ...S)); }': () 1581 259..280 '{ ...S)); }': ()
1582 [265; 269) 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64 1582 265..269 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
1583 [265; 277) 'get2(set(S))': u64 1583 265..277 'get2(set(S))': u64
1584 [270; 273) 'set': fn set<S<u64>>(S<u64>) -> S<u64> 1584 270..273 'set': fn set<S<u64>>(S<u64>) -> S<u64>
1585 [270; 276) 'set(S)': S<u64> 1585 270..276 'set(S)': S<u64>
1586 [274; 275) 'S': S<u64> 1586 274..275 'S': S<u64>
1587 "### 1587 "###
1588 ); 1588 );
1589} 1589}
@@ -1603,15 +1603,15 @@ fn test<F: FnOnce(u32, u64) -> u128>(f: F) {
1603} 1603}
1604"#), 1604"#),
1605 @r###" 1605 @r###"
1606 [57; 61) 'self': Self 1606 57..61 'self': Self
1607 [63; 67) 'args': Args 1607 63..67 'args': Args
1608 [150; 151) 'f': F 1608 150..151 'f': F
1609 [156; 184) '{ ...2)); }': () 1609 156..184 '{ ...2)); }': ()
1610 [162; 163) 'f': F 1610 162..163 'f': F
1611 [162; 181) 'f.call...1, 2))': u128 1611 162..181 'f.call...1, 2))': u128
1612 [174; 180) '(1, 2)': (u32, u64) 1612 174..180 '(1, 2)': (u32, u64)
1613 [175; 176) '1': u32 1613 175..176 '1': u32
1614 [178; 179) '2': u64 1614 178..179 '2': u64
1615 "### 1615 "###
1616 ); 1616 );
1617} 1617}
@@ -1638,32 +1638,32 @@ fn test() {
1638} 1638}
1639"#), 1639"#),
1640 @r###" 1640 @r###"
1641 [148; 152) 'self': Option<T> 1641 148..152 'self': Option<T>
1642 [154; 155) 'f': F 1642 154..155 'f': F
1643 [173; 175) '{}': () 1643 173..175 '{}': ()
1644 [189; 308) '{ ... 1); }': () 1644 189..308 '{ ... 1); }': ()
1645 [199; 200) 'x': Option<u32> 1645 199..200 'x': Option<u32>
1646 [203; 215) 'Option::Some': Some<u32>(u32) -> Option<u32> 1646 203..215 'Option::Some': Some<u32>(u32) -> Option<u32>
1647 [203; 221) 'Option...(1u32)': Option<u32> 1647 203..221 'Option...(1u32)': Option<u32>
1648 [216; 220) '1u32': u32 1648 216..220 '1u32': u32
1649 [227; 228) 'x': Option<u32> 1649 227..228 'x': Option<u32>
1650 [227; 243) 'x.map(...v + 1)': Option<u32> 1650 227..243 'x.map(...v + 1)': Option<u32>
1651 [233; 242) '|v| v + 1': |u32| -> u32 1651 233..242 '|v| v + 1': |u32| -> u32
1652 [234; 235) 'v': u32 1652 234..235 'v': u32
1653 [237; 238) 'v': u32 1653 237..238 'v': u32
1654 [237; 242) 'v + 1': u32 1654 237..242 'v + 1': u32
1655 [241; 242) '1': u32 1655 241..242 '1': u32
1656 [249; 250) 'x': Option<u32> 1656 249..250 'x': Option<u32>
1657 [249; 265) 'x.map(... 1u64)': Option<u64> 1657 249..265 'x.map(... 1u64)': Option<u64>
1658 [255; 264) '|_v| 1u64': |u32| -> u64 1658 255..264 '|_v| 1u64': |u32| -> u64
1659 [256; 258) '_v': u32 1659 256..258 '_v': u32
1660 [260; 264) '1u64': u64 1660 260..264 '1u64': u64
1661 [275; 276) 'y': Option<i64> 1661 275..276 'y': Option<i64>
1662 [292; 293) 'x': Option<u32> 1662 292..293 'x': Option<u32>
1663 [292; 305) 'x.map(|_v| 1)': Option<i64> 1663 292..305 'x.map(|_v| 1)': Option<i64>
1664 [298; 304) '|_v| 1': |u32| -> i64 1664 298..304 '|_v| 1': |u32| -> i64
1665 [299; 301) '_v': u32 1665 299..301 '_v': u32
1666 [303; 304) '1': i64 1666 303..304 '1': i64
1667 "### 1667 "###
1668 ); 1668 );
1669} 1669}
@@ -1684,26 +1684,26 @@ fn test<F: FnOnce(u32) -> u64>(f: F) {
1684} 1684}
1685"#), 1685"#),
1686 @r###" 1686 @r###"
1687 [73; 74) 'f': F 1687 73..74 'f': F
1688 [79; 155) '{ ...+ v; }': () 1688 79..155 '{ ...+ v; }': ()
1689 [85; 86) 'f': F 1689 85..86 'f': F
1690 [85; 89) 'f(1)': {unknown} 1690 85..89 'f(1)': {unknown}
1691 [87; 88) '1': i32 1691 87..88 '1': i32
1692 [99; 100) 'g': |u64| -> i32 1692 99..100 'g': |u64| -> i32
1693 [103; 112) '|v| v + 1': |u64| -> i32 1693 103..112 '|v| v + 1': |u64| -> i32
1694 [104; 105) 'v': u64 1694 104..105 'v': u64
1695 [107; 108) 'v': u64 1695 107..108 'v': u64
1696 [107; 112) 'v + 1': i32 1696 107..112 'v + 1': i32
1697 [111; 112) '1': i32 1697 111..112 '1': i32
1698 [118; 119) 'g': |u64| -> i32 1698 118..119 'g': |u64| -> i32
1699 [118; 125) 'g(1u64)': i32 1699 118..125 'g(1u64)': i32
1700 [120; 124) '1u64': u64 1700 120..124 '1u64': u64
1701 [135; 136) 'h': |u128| -> u128 1701 135..136 'h': |u128| -> u128
1702 [139; 152) '|v| 1u128 + v': |u128| -> u128 1702 139..152 '|v| 1u128 + v': |u128| -> u128
1703 [140; 141) 'v': u128 1703 140..141 'v': u128
1704 [143; 148) '1u128': u128 1704 143..148 '1u128': u128
1705 [143; 152) '1u128 + v': u128 1705 143..152 '1u128 + v': u128
1706 [151; 152) 'v': u128 1706 151..152 'v': u128
1707 "### 1707 "###
1708 ); 1708 );
1709} 1709}
@@ -1736,54 +1736,54 @@ fn test() {
1736} 1736}
1737"#), 1737"#),
1738 @r###" 1738 @r###"
1739 [95; 96) 'x': T 1739 95..96 'x': T
1740 [101; 102) 'f': F 1740 101..102 'f': F
1741 [112; 114) '{}': () 1741 112..114 '{}': ()
1742 [148; 149) 'f': F 1742 148..149 'f': F
1743 [154; 155) 'x': T 1743 154..155 'x': T
1744 [165; 167) '{}': () 1744 165..167 '{}': ()
1745 [202; 206) 'self': S 1745 202..206 'self': S
1746 [254; 258) 'self': S 1746 254..258 'self': S
1747 [260; 261) 'x': T 1747 260..261 'x': T
1748 [266; 267) 'f': F 1748 266..267 'f': F
1749 [277; 279) '{}': () 1749 277..279 '{}': ()
1750 [317; 321) 'self': S 1750 317..321 'self': S
1751 [323; 324) 'f': F 1751 323..324 'f': F
1752 [329; 330) 'x': T 1752 329..330 'x': T
1753 [340; 342) '{}': () 1753 340..342 '{}': ()
1754 [356; 515) '{ ... S); }': () 1754 356..515 '{ ... S); }': ()
1755 [366; 368) 'x1': u64 1755 366..368 'x1': u64
1756 [371; 375) 'foo1': fn foo1<S, u64, |S| -> u64>(S, |S| -> u64) -> u64 1756 371..375 'foo1': fn foo1<S, u64, |S| -> u64>(S, |S| -> u64) -> u64
1757 [371; 394) 'foo1(S...hod())': u64 1757 371..394 'foo1(S...hod())': u64
1758 [376; 377) 'S': S 1758 376..377 'S': S
1759 [379; 393) '|s| s.method()': |S| -> u64 1759 379..393 '|s| s.method()': |S| -> u64
1760 [380; 381) 's': S 1760 380..381 's': S
1761 [383; 384) 's': S 1761 383..384 's': S
1762 [383; 393) 's.method()': u64 1762 383..393 's.method()': u64
1763 [404; 406) 'x2': u64 1763 404..406 'x2': u64
1764 [409; 413) 'foo2': fn foo2<S, u64, |S| -> u64>(|S| -> u64, S) -> u64 1764 409..413 'foo2': fn foo2<S, u64, |S| -> u64>(|S| -> u64, S) -> u64
1765 [409; 432) 'foo2(|...(), S)': u64 1765 409..432 'foo2(|...(), S)': u64
1766 [414; 428) '|s| s.method()': |S| -> u64 1766 414..428 '|s| s.method()': |S| -> u64
1767 [415; 416) 's': S 1767 415..416 's': S
1768 [418; 419) 's': S 1768 418..419 's': S
1769 [418; 428) 's.method()': u64 1769 418..428 's.method()': u64
1770 [430; 431) 'S': S 1770 430..431 'S': S
1771 [442; 444) 'x3': u64 1771 442..444 'x3': u64
1772 [447; 448) 'S': S 1772 447..448 'S': S
1773 [447; 472) 'S.foo1...hod())': u64 1773 447..472 'S.foo1...hod())': u64
1774 [454; 455) 'S': S 1774 454..455 'S': S
1775 [457; 471) '|s| s.method()': |S| -> u64 1775 457..471 '|s| s.method()': |S| -> u64
1776 [458; 459) 's': S 1776 458..459 's': S
1777 [461; 462) 's': S 1777 461..462 's': S
1778 [461; 471) 's.method()': u64 1778 461..471 's.method()': u64
1779 [482; 484) 'x4': u64 1779 482..484 'x4': u64
1780 [487; 488) 'S': S 1780 487..488 'S': S
1781 [487; 512) 'S.foo2...(), S)': u64 1781 487..512 'S.foo2...(), S)': u64
1782 [494; 508) '|s| s.method()': |S| -> u64 1782 494..508 '|s| s.method()': |S| -> u64
1783 [495; 496) 's': S 1783 495..496 's': S
1784 [498; 499) 's': S 1784 498..499 's': S
1785 [498; 508) 's.method()': u64 1785 498..508 's.method()': u64
1786 [510; 511) 'S': S 1786 510..511 'S': S
1787 "### 1787 "###
1788 ); 1788 );
1789} 1789}
@@ -1858,18 +1858,18 @@ impl Trait for S2 {
1858} 1858}
1859"#, 1859"#,
1860 ), @r###" 1860 ), @r###"
1861 [54; 58) 'self': &Self 1861 54..58 'self': &Self
1862 [60; 61) 'x': Trait::Item<Self> 1862 60..61 'x': Trait::Item<Self>
1863 [140; 144) 'self': &S 1863 140..144 'self': &S
1864 [146; 147) 'x': u32 1864 146..147 'x': u32
1865 [161; 175) '{ let y = x; }': () 1865 161..175 '{ let y = x; }': ()
1866 [167; 168) 'y': u32 1866 167..168 'y': u32
1867 [171; 172) 'x': u32 1867 171..172 'x': u32
1868 [242; 246) 'self': &S2 1868 242..246 'self': &S2
1869 [248; 249) 'x': i32 1869 248..249 'x': i32
1870 [265; 279) '{ let y = x; }': () 1870 265..279 '{ let y = x; }': ()
1871 [271; 272) 'y': i32 1871 271..272 'y': i32
1872 [275; 276) 'x': i32 1872 275..276 'x': i32
1873 "###); 1873 "###);
1874} 1874}
1875 1875
@@ -2077,15 +2077,15 @@ impl TokenStream for Rustc {
2077} 2077}
2078"#, true), 2078"#, true),
2079 @r###" 2079 @r###"
2080 [1115; 1126) '{ loop {} }': T 2080 1115..1126 '{ loop {} }': T
2081 [1117; 1124) 'loop {}': ! 2081 1117..1124 'loop {}': !
2082 [1122; 1124) '{}': () 2082 1122..1124 '{}': ()
2083 [1190; 1253) '{ ... }': {unknown} 2083 1190..1253 '{ ... }': {unknown}
2084 [1204; 1209) 'group': {unknown} 2084 1204..1209 'group': {unknown}
2085 [1225; 1229) 'make': fn make<{unknown}>() -> {unknown} 2085 1225..1229 'make': fn make<{unknown}>() -> {unknown}
2086 [1225; 1231) 'make()': {unknown} 2086 1225..1231 'make()': {unknown}
2087 [1241; 1245) 'make': fn make<{unknown}>() -> {unknown} 2087 1241..1245 'make': fn make<{unknown}>() -> {unknown}
2088 [1241; 1247) 'make()': {unknown} 2088 1241..1247 'make()': {unknown}
2089 "### 2089 "###
2090 ); 2090 );
2091} 2091}
@@ -2112,37 +2112,37 @@ fn test() -> impl Trait<i32> {
2112} 2112}
2113"#, true), 2113"#, true),
2114 @r###" 2114 @r###"
2115 [27; 28) 'x': impl Trait<u32> 2115 27..28 'x': impl Trait<u32>
2116 [47; 58) '{ loop {} }': () 2116 47..58 '{ loop {} }': ()
2117 [49; 56) 'loop {}': ! 2117 49..56 'loop {}': !
2118 [54; 56) '{}': () 2118 54..56 '{}': ()
2119 [69; 70) 'x': impl Trait<T> 2119 69..70 'x': impl Trait<T>
2120 [92; 103) '{ loop {} }': T 2120 92..103 '{ loop {} }': T
2121 [94; 101) 'loop {}': ! 2121 94..101 'loop {}': !
2122 [99; 101) '{}': () 2122 99..101 '{}': ()
2123 [172; 183) '{ loop {} }': T 2123 172..183 '{ loop {} }': T
2124 [174; 181) 'loop {}': ! 2124 174..181 'loop {}': !
2125 [179; 181) '{}': () 2125 179..181 '{}': ()
2126 [214; 310) '{ ...t()) }': S<{unknown}> 2126 214..310 '{ ...t()) }': S<{unknown}>
2127 [224; 226) 's1': S<u32> 2127 224..226 's1': S<u32>
2128 [229; 230) 'S': S<u32>(u32) -> S<u32> 2128 229..230 'S': S<u32>(u32) -> S<u32>
2129 [229; 241) 'S(default())': S<u32> 2129 229..241 'S(default())': S<u32>
2130 [231; 238) 'default': fn default<u32>() -> u32 2130 231..238 'default': fn default<u32>() -> u32
2131 [231; 240) 'default()': u32 2131 231..240 'default()': u32
2132 [247; 250) 'foo': fn foo(S<u32>) 2132 247..250 'foo': fn foo(S<u32>)
2133 [247; 254) 'foo(s1)': () 2133 247..254 'foo(s1)': ()
2134 [251; 253) 's1': S<u32> 2134 251..253 's1': S<u32>
2135 [264; 265) 'x': i32 2135 264..265 'x': i32
2136 [273; 276) 'bar': fn bar<i32>(S<i32>) -> i32 2136 273..276 'bar': fn bar<i32>(S<i32>) -> i32
2137 [273; 290) 'bar(S(...lt()))': i32 2137 273..290 'bar(S(...lt()))': i32
2138 [277; 278) 'S': S<i32>(i32) -> S<i32> 2138 277..278 'S': S<i32>(i32) -> S<i32>
2139 [277; 289) 'S(default())': S<i32> 2139 277..289 'S(default())': S<i32>
2140 [279; 286) 'default': fn default<i32>() -> i32 2140 279..286 'default': fn default<i32>() -> i32
2141 [279; 288) 'default()': i32 2141 279..288 'default()': i32
2142 [296; 297) 'S': S<{unknown}>({unknown}) -> S<{unknown}> 2142 296..297 'S': S<{unknown}>({unknown}) -> S<{unknown}>
2143 [296; 308) 'S(default())': S<{unknown}> 2143 296..308 'S(default())': S<{unknown}>
2144 [298; 305) 'default': fn default<{unknown}>() -> {unknown} 2144 298..305 'default': fn default<{unknown}>() -> {unknown}
2145 [298; 307) 'default()': {unknown} 2145 298..307 'default()': {unknown}
2146 "### 2146 "###
2147 ); 2147 );
2148} 2148}
@@ -2176,15 +2176,15 @@ fn main() {
2176} 2176}
2177"#), 2177"#),
2178 @r###" 2178 @r###"
2179 [147; 149) '_v': F 2179 147..149 '_v': F
2180 [192; 195) '{ }': () 2180 192..195 '{ }': ()
2181 [207; 238) '{ ... }); }': () 2181 207..238 '{ ... }); }': ()
2182 [213; 223) 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ()) 2182 213..223 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ())
2183 [213; 235) 'f::<()... z; })': () 2183 213..235 'f::<()... z; })': ()
2184 [224; 234) '|z| { z; }': |&()| -> () 2184 224..234 '|z| { z; }': |&()| -> ()
2185 [225; 226) 'z': &() 2185 225..226 'z': &()
2186 [228; 234) '{ z; }': () 2186 228..234 '{ z; }': ()
2187 [230; 231) 'z': &() 2187 230..231 'z': &()
2188 "### 2188 "###
2189 ); 2189 );
2190} 2190}
@@ -2337,46 +2337,46 @@ fn main() {
2337} 2337}
2338"#), 2338"#),
2339 @r###" 2339 @r###"
2340 [240; 244) 'self': Self 2340 240..244 'self': Self
2341 [246; 247) 'f': F 2341 246..247 'f': F
2342 [331; 342) '{ loop {} }': FilterMap<Self, F> 2342 331..342 '{ loop {} }': FilterMap<Self, F>
2343 [333; 340) 'loop {}': ! 2343 333..340 'loop {}': !
2344 [338; 340) '{}': () 2344 338..340 '{}': ()
2345 [363; 367) 'self': Self 2345 363..367 'self': Self
2346 [369; 370) 'f': F 2346 369..370 'f': F
2347 [419; 430) '{ loop {} }': () 2347 419..430 '{ loop {} }': ()
2348 [421; 428) 'loop {}': ! 2348 421..428 'loop {}': !
2349 [426; 428) '{}': () 2349 426..428 '{}': ()
2350 [539; 543) 'self': Self 2350 539..543 'self': Self
2351 [868; 872) 'self': I 2351 868..872 'self': I
2352 [879; 899) '{ ... }': I 2352 879..899 '{ ... }': I
2353 [889; 893) 'self': I 2353 889..893 'self': I
2354 [958; 969) '{ loop {} }': Vec<T> 2354 958..969 '{ loop {} }': Vec<T>
2355 [960; 967) 'loop {}': ! 2355 960..967 'loop {}': !
2356 [965; 967) '{}': () 2356 965..967 '{}': ()
2357 [1156; 1287) '{ ... }); }': () 2357 1156..1287 '{ ... }); }': ()
2358 [1162; 1177) 'Vec::<i32>::new': fn new<i32>() -> Vec<i32> 2358 1162..1177 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
2359 [1162; 1179) 'Vec::<...:new()': Vec<i32> 2359 1162..1179 'Vec::<...:new()': Vec<i32>
2360 [1162; 1191) 'Vec::<...iter()': IntoIter<i32> 2360 1162..1191 'Vec::<...iter()': IntoIter<i32>
2361 [1162; 1256) 'Vec::<...one })': FilterMap<IntoIter<i32>, |i32| -> Option<u32>> 2361 1162..1256 'Vec::<...one })': FilterMap<IntoIter<i32>, |i32| -> Option<u32>>
2362 [1162; 1284) 'Vec::<... y; })': () 2362 1162..1284 'Vec::<... y; })': ()
2363 [1210; 1255) '|x| if...None }': |i32| -> Option<u32> 2363 1210..1255 '|x| if...None }': |i32| -> Option<u32>
2364 [1211; 1212) 'x': i32 2364 1211..1212 'x': i32
2365 [1214; 1255) 'if x >...None }': Option<u32> 2365 1214..1255 'if x >...None }': Option<u32>
2366 [1217; 1218) 'x': i32 2366 1217..1218 'x': i32
2367 [1217; 1222) 'x > 0': bool 2367 1217..1222 'x > 0': bool
2368 [1221; 1222) '0': i32 2368 1221..1222 '0': i32
2369 [1223; 1241) '{ Some...u32) }': Option<u32> 2369 1223..1241 '{ Some...u32) }': Option<u32>
2370 [1225; 1229) 'Some': Some<u32>(u32) -> Option<u32> 2370 1225..1229 'Some': Some<u32>(u32) -> Option<u32>
2371 [1225; 1239) 'Some(x as u32)': Option<u32> 2371 1225..1239 'Some(x as u32)': Option<u32>
2372 [1230; 1231) 'x': i32 2372 1230..1231 'x': i32
2373 [1230; 1238) 'x as u32': u32 2373 1230..1238 'x as u32': u32
2374 [1247; 1255) '{ None }': Option<u32> 2374 1247..1255 '{ None }': Option<u32>
2375 [1249; 1253) 'None': Option<u32> 2375 1249..1253 'None': Option<u32>
2376 [1273; 1283) '|y| { y; }': |u32| -> () 2376 1273..1283 '|y| { y; }': |u32| -> ()
2377 [1274; 1275) 'y': u32 2377 1274..1275 'y': u32
2378 [1277; 1283) '{ y; }': () 2378 1277..1283 '{ y; }': ()
2379 [1279; 1280) 'y': u32 2379 1279..1280 'y': u32
2380 "### 2380 "###
2381 ); 2381 );
2382} 2382}
@@ -2428,13 +2428,13 @@ fn test(x: &dyn Foo) {
2428} 2428}
2429"#, true), 2429"#, true),
2430 @r###" 2430 @r###"
2431 [22; 23) 'x': &dyn Foo 2431 22..23 'x': &dyn Foo
2432 [35; 37) '{}': () 2432 35..37 '{}': ()
2433 [47; 48) 'x': &dyn Foo 2433 47..48 'x': &dyn Foo
2434 [60; 75) '{ foo(x); }': () 2434 60..75 '{ foo(x); }': ()
2435 [66; 69) 'foo': fn foo(&dyn Foo) 2435 66..69 'foo': fn foo(&dyn Foo)
2436 [66; 72) 'foo(x)': () 2436 66..72 'foo(x)': ()
2437 [70; 71) 'x': &dyn Foo 2437 70..71 'x': &dyn Foo
2438 "### 2438 "###
2439 ); 2439 );
2440} 2440}
diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs
index b00b6d431..85d1f0cb1 100644
--- a/crates/ra_ide/src/call_hierarchy.rs
+++ b/crates/ra_ide/src/call_hierarchy.rs
@@ -183,8 +183,8 @@ mod tests {
183 call<|>ee(); 183 call<|>ee();
184 } 184 }
185 "#, 185 "#,
186 "callee FN_DEF FileId(1) [0; 14) [3; 9)", 186 "callee FN_DEF FileId(1) 0..14 3..9",
187 &["caller FN_DEF FileId(1) [15; 44) [18; 24) : [[33; 39)]"], 187 &["caller FN_DEF FileId(1) 15..44 18..24 : [33..39]"],
188 &[], 188 &[],
189 ); 189 );
190 } 190 }
@@ -199,8 +199,8 @@ mod tests {
199 callee(); 199 callee();
200 } 200 }
201 "#, 201 "#,
202 "callee FN_DEF FileId(1) [0; 14) [3; 9)", 202 "callee FN_DEF FileId(1) 0..14 3..9",
203 &["caller FN_DEF FileId(1) [15; 44) [18; 24) : [[33; 39)]"], 203 &["caller FN_DEF FileId(1) 15..44 18..24 : [33..39]"],
204 &[], 204 &[],
205 ); 205 );
206 } 206 }
@@ -216,8 +216,8 @@ mod tests {
216 callee(); 216 callee();
217 } 217 }
218 "#, 218 "#,
219 "callee FN_DEF FileId(1) [0; 14) [3; 9)", 219 "callee FN_DEF FileId(1) 0..14 3..9",
220 &["caller FN_DEF FileId(1) [15; 58) [18; 24) : [[33; 39), [47; 53)]"], 220 &["caller FN_DEF FileId(1) 15..58 18..24 : [33..39, 47..53]"],
221 &[], 221 &[],
222 ); 222 );
223 } 223 }
@@ -236,10 +236,10 @@ mod tests {
236 callee(); 236 callee();
237 } 237 }
238 "#, 238 "#,
239 "callee FN_DEF FileId(1) [0; 14) [3; 9)", 239 "callee FN_DEF FileId(1) 0..14 3..9",
240 &[ 240 &[
241 "caller1 FN_DEF FileId(1) [15; 45) [18; 25) : [[34; 40)]", 241 "caller1 FN_DEF FileId(1) 15..45 18..25 : [34..40]",
242 "caller2 FN_DEF FileId(1) [46; 76) [49; 56) : [[65; 71)]", 242 "caller2 FN_DEF FileId(1) 46..76 49..56 : [65..71]",
243 ], 243 ],
244 &[], 244 &[],
245 ); 245 );
@@ -260,8 +260,8 @@ mod tests {
260 //- /foo/mod.rs 260 //- /foo/mod.rs
261 pub fn callee() {} 261 pub fn callee() {}
262 "#, 262 "#,
263 "callee FN_DEF FileId(2) [0; 18) [7; 13)", 263 "callee FN_DEF FileId(2) 0..18 7..13",
264 &["caller FN_DEF FileId(1) [26; 55) [29; 35) : [[44; 50)]"], 264 &["caller FN_DEF FileId(1) 26..55 29..35 : [44..50]"],
265 &[], 265 &[],
266 ); 266 );
267 } 267 }
@@ -277,9 +277,9 @@ mod tests {
277 callee(); 277 callee();
278 } 278 }
279 "#, 279 "#,
280 "caller FN_DEF FileId(1) [15; 58) [18; 24)", 280 "caller FN_DEF FileId(1) 15..58 18..24",
281 &[], 281 &[],
282 &["callee FN_DEF FileId(1) [0; 14) [3; 9) : [[33; 39), [47; 53)]"], 282 &["callee FN_DEF FileId(1) 0..14 3..9 : [33..39, 47..53]"],
283 ); 283 );
284 } 284 }
285 285
@@ -298,9 +298,9 @@ mod tests {
298 //- /foo/mod.rs 298 //- /foo/mod.rs
299 pub fn callee() {} 299 pub fn callee() {}
300 "#, 300 "#,
301 "caller FN_DEF FileId(1) [26; 55) [29; 35)", 301 "caller FN_DEF FileId(1) 26..55 29..35",
302 &[], 302 &[],
303 &["callee FN_DEF FileId(2) [0; 18) [7; 13) : [[44; 50)]"], 303 &["callee FN_DEF FileId(2) 0..18 7..13 : [44..50]"],
304 ); 304 );
305 } 305 }
306 306
@@ -321,9 +321,9 @@ mod tests {
321 321
322 } 322 }
323 "#, 323 "#,
324 "caller2 FN_DEF FileId(1) [32; 63) [35; 42)", 324 "caller2 FN_DEF FileId(1) 32..63 35..42",
325 &["caller1 FN_DEF FileId(1) [0; 31) [3; 10) : [[19; 26)]"], 325 &["caller1 FN_DEF FileId(1) 0..31 3..10 : [19..26]"],
326 &["caller3 FN_DEF FileId(1) [64; 80) [67; 74) : [[51; 58)]"], 326 &["caller3 FN_DEF FileId(1) 64..80 67..74 : [51..58]"],
327 ); 327 );
328 } 328 }
329} 329}
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index 5da254a6e..780a03c13 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -126,7 +126,7 @@ impl FnCallNode {
126 ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)), 126 ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)),
127 ast::MethodCallExpr(it) => { 127 ast::MethodCallExpr(it) => {
128 let arg_list = it.arg_list()?; 128 let arg_list = it.arg_list()?;
129 if !syntax.text_range().is_subrange(&arg_list.syntax().text_range()) { 129 if !arg_list.syntax().text_range().contains_range(syntax.text_range()) {
130 return None; 130 return None;
131 } 131 }
132 Some(FnCallNode::MethodCallExpr(it)) 132 Some(FnCallNode::MethodCallExpr(it))
diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs
index b405042e8..8bf952798 100644
--- a/crates/ra_ide/src/completion/complete_attribute.rs
+++ b/crates/ra_ide/src/completion/complete_attribute.rs
@@ -147,190 +147,190 @@ mod tests {
147 [ 147 [
148 CompletionItem { 148 CompletionItem {
149 label: "allow", 149 label: "allow",
150 source_range: [19; 19), 150 source_range: 19..19,
151 delete: [19; 19), 151 delete: 19..19,
152 insert: "allow(${0:lint})", 152 insert: "allow(${0:lint})",
153 kind: Attribute, 153 kind: Attribute,
154 }, 154 },
155 CompletionItem { 155 CompletionItem {
156 label: "cfg", 156 label: "cfg",
157 source_range: [19; 19), 157 source_range: 19..19,
158 delete: [19; 19), 158 delete: 19..19,
159 insert: "cfg(${0:predicate})", 159 insert: "cfg(${0:predicate})",
160 kind: Attribute, 160 kind: Attribute,
161 }, 161 },
162 CompletionItem { 162 CompletionItem {
163 label: "cfg_attr", 163 label: "cfg_attr",
164 source_range: [19; 19), 164 source_range: 19..19,
165 delete: [19; 19), 165 delete: 19..19,
166 insert: "cfg_attr(${1:predicate}, ${0:attr})", 166 insert: "cfg_attr(${1:predicate}, ${0:attr})",
167 kind: Attribute, 167 kind: Attribute,
168 }, 168 },
169 CompletionItem { 169 CompletionItem {
170 label: "deny", 170 label: "deny",
171 source_range: [19; 19), 171 source_range: 19..19,
172 delete: [19; 19), 172 delete: 19..19,
173 insert: "deny(${0:lint})", 173 insert: "deny(${0:lint})",
174 kind: Attribute, 174 kind: Attribute,
175 }, 175 },
176 CompletionItem { 176 CompletionItem {
177 label: "deprecated", 177 label: "deprecated",
178 source_range: [19; 19), 178 source_range: 19..19,
179 delete: [19; 19), 179 delete: 19..19,
180 insert: "deprecated = \"${0:reason}\"", 180 insert: "deprecated = \"${0:reason}\"",
181 kind: Attribute, 181 kind: Attribute,
182 }, 182 },
183 CompletionItem { 183 CompletionItem {
184 label: "derive", 184 label: "derive",
185 source_range: [19; 19), 185 source_range: 19..19,
186 delete: [19; 19), 186 delete: 19..19,
187 insert: "derive(${0:Debug})", 187 insert: "derive(${0:Debug})",
188 kind: Attribute, 188 kind: Attribute,
189 }, 189 },
190 CompletionItem { 190 CompletionItem {
191 label: "doc", 191 label: "doc",
192 source_range: [19; 19), 192 source_range: 19..19,
193 delete: [19; 19), 193 delete: 19..19,
194 insert: "doc = \"${0:docs}\"", 194 insert: "doc = \"${0:docs}\"",
195 kind: Attribute, 195 kind: Attribute,
196 }, 196 },
197 CompletionItem { 197 CompletionItem {
198 label: "forbid", 198 label: "forbid",
199 source_range: [19; 19), 199 source_range: 19..19,
200 delete: [19; 19), 200 delete: 19..19,
201 insert: "forbid(${0:lint})", 201 insert: "forbid(${0:lint})",
202 kind: Attribute, 202 kind: Attribute,
203 }, 203 },
204 CompletionItem { 204 CompletionItem {
205 label: "ignore", 205 label: "ignore",
206 source_range: [19; 19), 206 source_range: 19..19,
207 delete: [19; 19), 207 delete: 19..19,
208 insert: "ignore(${0:lint})", 208 insert: "ignore(${0:lint})",
209 kind: Attribute, 209 kind: Attribute,
210 }, 210 },
211 CompletionItem { 211 CompletionItem {
212 label: "inline", 212 label: "inline",
213 source_range: [19; 19), 213 source_range: 19..19,
214 delete: [19; 19), 214 delete: 19..19,
215 insert: "inline(${0:lint})", 215 insert: "inline(${0:lint})",
216 kind: Attribute, 216 kind: Attribute,
217 }, 217 },
218 CompletionItem { 218 CompletionItem {
219 label: "link", 219 label: "link",
220 source_range: [19; 19), 220 source_range: 19..19,
221 delete: [19; 19), 221 delete: 19..19,
222 insert: "link", 222 insert: "link",
223 kind: Attribute, 223 kind: Attribute,
224 }, 224 },
225 CompletionItem { 225 CompletionItem {
226 label: "link_name", 226 label: "link_name",
227 source_range: [19; 19), 227 source_range: 19..19,
228 delete: [19; 19), 228 delete: 19..19,
229 insert: "link_name = \"${0:symbol_name}\"", 229 insert: "link_name = \"${0:symbol_name}\"",
230 kind: Attribute, 230 kind: Attribute,
231 }, 231 },
232 CompletionItem { 232 CompletionItem {
233 label: "macro_export", 233 label: "macro_export",
234 source_range: [19; 19), 234 source_range: 19..19,
235 delete: [19; 19), 235 delete: 19..19,
236 insert: "macro_export", 236 insert: "macro_export",
237 kind: Attribute, 237 kind: Attribute,
238 }, 238 },
239 CompletionItem { 239 CompletionItem {
240 label: "macro_use", 240 label: "macro_use",
241 source_range: [19; 19), 241 source_range: 19..19,
242 delete: [19; 19), 242 delete: 19..19,
243 insert: "macro_use", 243 insert: "macro_use",
244 kind: Attribute, 244 kind: Attribute,
245 }, 245 },
246 CompletionItem { 246 CompletionItem {
247 label: "must_use", 247 label: "must_use",
248 source_range: [19; 19), 248 source_range: 19..19,
249 delete: [19; 19), 249 delete: 19..19,
250 insert: "must_use = \"${0:reason}\"", 250 insert: "must_use = \"${0:reason}\"",
251 kind: Attribute, 251 kind: Attribute,
252 }, 252 },
253 CompletionItem { 253 CompletionItem {
254 label: "no_mangle", 254 label: "no_mangle",
255 source_range: [19; 19), 255 source_range: 19..19,
256 delete: [19; 19), 256 delete: 19..19,
257 insert: "no_mangle", 257 insert: "no_mangle",
258 kind: Attribute, 258 kind: Attribute,
259 }, 259 },
260 CompletionItem { 260 CompletionItem {
261 label: "non_exhaustive", 261 label: "non_exhaustive",
262 source_range: [19; 19), 262 source_range: 19..19,
263 delete: [19; 19), 263 delete: 19..19,
264 insert: "non_exhaustive", 264 insert: "non_exhaustive",
265 kind: Attribute, 265 kind: Attribute,
266 }, 266 },
267 CompletionItem { 267 CompletionItem {
268 label: "path", 268 label: "path",
269 source_range: [19; 19), 269 source_range: 19..19,
270 delete: [19; 19), 270 delete: 19..19,
271 insert: "path =\"${0:path}\"", 271 insert: "path =\"${0:path}\"",
272 kind: Attribute, 272 kind: Attribute,
273 }, 273 },
274 CompletionItem { 274 CompletionItem {
275 label: "proc_macro", 275 label: "proc_macro",
276 source_range: [19; 19), 276 source_range: 19..19,
277 delete: [19; 19), 277 delete: 19..19,
278 insert: "proc_macro", 278 insert: "proc_macro",
279 kind: Attribute, 279 kind: Attribute,
280 }, 280 },
281 CompletionItem { 281 CompletionItem {
282 label: "proc_macro_attribute", 282 label: "proc_macro_attribute",
283 source_range: [19; 19), 283 source_range: 19..19,
284 delete: [19; 19), 284 delete: 19..19,
285 insert: "proc_macro_attribute", 285 insert: "proc_macro_attribute",
286 kind: Attribute, 286 kind: Attribute,
287 }, 287 },
288 CompletionItem { 288 CompletionItem {
289 label: "proc_macro_derive", 289 label: "proc_macro_derive",
290 source_range: [19; 19), 290 source_range: 19..19,
291 delete: [19; 19), 291 delete: 19..19,
292 insert: "proc_macro_derive(${0:Trait})", 292 insert: "proc_macro_derive(${0:Trait})",
293 kind: Attribute, 293 kind: Attribute,
294 }, 294 },
295 CompletionItem { 295 CompletionItem {
296 label: "repr", 296 label: "repr",
297 source_range: [19; 19), 297 source_range: 19..19,
298 delete: [19; 19), 298 delete: 19..19,
299 insert: "repr(${0:C})", 299 insert: "repr(${0:C})",
300 kind: Attribute, 300 kind: Attribute,
301 }, 301 },
302 CompletionItem { 302 CompletionItem {
303 label: "should_panic", 303 label: "should_panic",
304 source_range: [19; 19), 304 source_range: 19..19,
305 delete: [19; 19), 305 delete: 19..19,
306 insert: "expected = \"${0:reason}\"", 306 insert: "expected = \"${0:reason}\"",
307 kind: Attribute, 307 kind: Attribute,
308 }, 308 },
309 CompletionItem { 309 CompletionItem {
310 label: "target_feature", 310 label: "target_feature",
311 source_range: [19; 19), 311 source_range: 19..19,
312 delete: [19; 19), 312 delete: 19..19,
313 insert: "target_feature = \"${0:feature}\"", 313 insert: "target_feature = \"${0:feature}\"",
314 kind: Attribute, 314 kind: Attribute,
315 }, 315 },
316 CompletionItem { 316 CompletionItem {
317 label: "test", 317 label: "test",
318 source_range: [19; 19), 318 source_range: 19..19,
319 delete: [19; 19), 319 delete: 19..19,
320 insert: "test", 320 insert: "test",
321 kind: Attribute, 321 kind: Attribute,
322 }, 322 },
323 CompletionItem { 323 CompletionItem {
324 label: "used", 324 label: "used",
325 source_range: [19; 19), 325 source_range: 19..19,
326 delete: [19; 19), 326 delete: 19..19,
327 insert: "used", 327 insert: "used",
328 kind: Attribute, 328 kind: Attribute,
329 }, 329 },
330 CompletionItem { 330 CompletionItem {
331 label: "warn", 331 label: "warn",
332 source_range: [19; 19), 332 source_range: 19..19,
333 delete: [19; 19), 333 delete: 19..19,
334 insert: "warn(${0:lint})", 334 insert: "warn(${0:lint})",
335 kind: Attribute, 335 kind: Attribute,
336 }, 336 },
@@ -351,232 +351,232 @@ mod tests {
351 [ 351 [
352 CompletionItem { 352 CompletionItem {
353 label: "allow", 353 label: "allow",
354 source_range: [20; 20), 354 source_range: 20..20,
355 delete: [20; 20), 355 delete: 20..20,
356 insert: "allow(${0:lint})", 356 insert: "allow(${0:lint})",
357 kind: Attribute, 357 kind: Attribute,
358 }, 358 },
359 CompletionItem { 359 CompletionItem {
360 label: "cfg", 360 label: "cfg",
361 source_range: [20; 20), 361 source_range: 20..20,
362 delete: [20; 20), 362 delete: 20..20,
363 insert: "cfg(${0:predicate})", 363 insert: "cfg(${0:predicate})",
364 kind: Attribute, 364 kind: Attribute,
365 }, 365 },
366 CompletionItem { 366 CompletionItem {
367 label: "cfg_attr", 367 label: "cfg_attr",
368 source_range: [20; 20), 368 source_range: 20..20,
369 delete: [20; 20), 369 delete: 20..20,
370 insert: "cfg_attr(${1:predicate}, ${0:attr})", 370 insert: "cfg_attr(${1:predicate}, ${0:attr})",
371 kind: Attribute, 371 kind: Attribute,
372 }, 372 },
373 CompletionItem { 373 CompletionItem {
374 label: "deny", 374 label: "deny",
375 source_range: [20; 20), 375 source_range: 20..20,
376 delete: [20; 20), 376 delete: 20..20,
377 insert: "deny(${0:lint})", 377 insert: "deny(${0:lint})",
378 kind: Attribute, 378 kind: Attribute,
379 }, 379 },
380 CompletionItem { 380 CompletionItem {
381 label: "deprecated", 381 label: "deprecated",
382 source_range: [20; 20), 382 source_range: 20..20,
383 delete: [20; 20), 383 delete: 20..20,
384 insert: "deprecated = \"${0:reason}\"", 384 insert: "deprecated = \"${0:reason}\"",
385 kind: Attribute, 385 kind: Attribute,
386 }, 386 },
387 CompletionItem { 387 CompletionItem {
388 label: "derive", 388 label: "derive",
389 source_range: [20; 20), 389 source_range: 20..20,
390 delete: [20; 20), 390 delete: 20..20,
391 insert: "derive(${0:Debug})", 391 insert: "derive(${0:Debug})",
392 kind: Attribute, 392 kind: Attribute,
393 }, 393 },
394 CompletionItem { 394 CompletionItem {
395 label: "doc", 395 label: "doc",
396 source_range: [20; 20), 396 source_range: 20..20,
397 delete: [20; 20), 397 delete: 20..20,
398 insert: "doc = \"${0:docs}\"", 398 insert: "doc = \"${0:docs}\"",
399 kind: Attribute, 399 kind: Attribute,
400 }, 400 },
401 CompletionItem { 401 CompletionItem {
402 label: "feature", 402 label: "feature",
403 source_range: [20; 20), 403 source_range: 20..20,
404 delete: [20; 20), 404 delete: 20..20,
405 insert: "feature(${0:flag})", 405 insert: "feature(${0:flag})",
406 kind: Attribute, 406 kind: Attribute,
407 }, 407 },
408 CompletionItem { 408 CompletionItem {
409 label: "forbid", 409 label: "forbid",
410 source_range: [20; 20), 410 source_range: 20..20,
411 delete: [20; 20), 411 delete: 20..20,
412 insert: "forbid(${0:lint})", 412 insert: "forbid(${0:lint})",
413 kind: Attribute, 413 kind: Attribute,
414 }, 414 },
415 CompletionItem { 415 CompletionItem {
416 label: "global_allocator", 416 label: "global_allocator",
417 source_range: [20; 20), 417 source_range: 20..20,
418 delete: [20; 20), 418 delete: 20..20,
419 insert: "global_allocator", 419 insert: "global_allocator",
420 kind: Attribute, 420 kind: Attribute,
421 }, 421 },
422 CompletionItem { 422 CompletionItem {
423 label: "ignore", 423 label: "ignore",
424 source_range: [20; 20), 424 source_range: 20..20,
425 delete: [20; 20), 425 delete: 20..20,
426 insert: "ignore(${0:lint})", 426 insert: "ignore(${0:lint})",
427 kind: Attribute, 427 kind: Attribute,
428 }, 428 },
429 CompletionItem { 429 CompletionItem {
430 label: "inline", 430 label: "inline",
431 source_range: [20; 20), 431 source_range: 20..20,
432 delete: [20; 20), 432 delete: 20..20,
433 insert: "inline(${0:lint})", 433 insert: "inline(${0:lint})",
434 kind: Attribute, 434 kind: Attribute,
435 }, 435 },
436 CompletionItem { 436 CompletionItem {
437 label: "link", 437 label: "link",
438 source_range: [20; 20), 438 source_range: 20..20,
439 delete: [20; 20), 439 delete: 20..20,
440 insert: "link", 440 insert: "link",
441 kind: Attribute, 441 kind: Attribute,
442 }, 442 },
443 CompletionItem { 443 CompletionItem {
444 label: "link_name", 444 label: "link_name",
445 source_range: [20; 20), 445 source_range: 20..20,
446 delete: [20; 20), 446 delete: 20..20,
447 insert: "link_name = \"${0:symbol_name}\"", 447 insert: "link_name = \"${0:symbol_name}\"",
448 kind: Attribute, 448 kind: Attribute,
449 }, 449 },
450 CompletionItem { 450 CompletionItem {
451 label: "macro_export", 451 label: "macro_export",
452 source_range: [20; 20), 452 source_range: 20..20,
453 delete: [20; 20), 453 delete: 20..20,
454 insert: "macro_export", 454 insert: "macro_export",
455 kind: Attribute, 455 kind: Attribute,
456 }, 456 },
457 CompletionItem { 457 CompletionItem {
458 label: "macro_use", 458 label: "macro_use",
459 source_range: [20; 20), 459 source_range: 20..20,
460 delete: [20; 20), 460 delete: 20..20,
461 insert: "macro_use", 461 insert: "macro_use",
462 kind: Attribute, 462 kind: Attribute,
463 }, 463 },
464 CompletionItem { 464 CompletionItem {
465 label: "must_use", 465 label: "must_use",
466 source_range: [20; 20), 466 source_range: 20..20,
467 delete: [20; 20), 467 delete: 20..20,
468 insert: "must_use = \"${0:reason}\"", 468 insert: "must_use = \"${0:reason}\"",
469 kind: Attribute, 469 kind: Attribute,
470 }, 470 },
471 CompletionItem { 471 CompletionItem {
472 label: "no_mangle", 472 label: "no_mangle",
473 source_range: [20; 20), 473 source_range: 20..20,
474 delete: [20; 20), 474 delete: 20..20,
475 insert: "no_mangle", 475 insert: "no_mangle",
476 kind: Attribute, 476 kind: Attribute,
477 }, 477 },
478 CompletionItem { 478 CompletionItem {
479 label: "no_std", 479 label: "no_std",
480 source_range: [20; 20), 480 source_range: 20..20,
481 delete: [20; 20), 481 delete: 20..20,
482 insert: "no_std", 482 insert: "no_std",
483 kind: Attribute, 483 kind: Attribute,
484 }, 484 },
485 CompletionItem { 485 CompletionItem {
486 label: "non_exhaustive", 486 label: "non_exhaustive",
487 source_range: [20; 20), 487 source_range: 20..20,
488 delete: [20; 20), 488 delete: 20..20,
489 insert: "non_exhaustive", 489 insert: "non_exhaustive",
490 kind: Attribute, 490 kind: Attribute,
491 }, 491 },
492 CompletionItem { 492 CompletionItem {
493 label: "panic_handler", 493 label: "panic_handler",
494 source_range: [20; 20), 494 source_range: 20..20,
495 delete: [20; 20), 495 delete: 20..20,
496 insert: "panic_handler", 496 insert: "panic_handler",
497 kind: Attribute, 497 kind: Attribute,
498 }, 498 },
499 CompletionItem { 499 CompletionItem {
500 label: "path", 500 label: "path",
501 source_range: [20; 20), 501 source_range: 20..20,
502 delete: [20; 20), 502 delete: 20..20,
503 insert: "path =\"${0:path}\"", 503 insert: "path =\"${0:path}\"",
504 kind: Attribute, 504 kind: Attribute,
505 }, 505 },
506 CompletionItem { 506 CompletionItem {
507 label: "proc_macro", 507 label: "proc_macro",
508 source_range: [20; 20), 508 source_range: 20..20,
509 delete: [20; 20), 509 delete: 20..20,
510 insert: "proc_macro", 510 insert: "proc_macro",
511 kind: Attribute, 511 kind: Attribute,
512 }, 512 },
513 CompletionItem { 513 CompletionItem {
514 label: "proc_macro_attribute", 514 label: "proc_macro_attribute",
515 source_range: [20; 20), 515 source_range: 20..20,
516 delete: [20; 20), 516 delete: 20..20,
517 insert: "proc_macro_attribute", 517 insert: "proc_macro_attribute",
518 kind: Attribute, 518 kind: Attribute,
519 }, 519 },
520 CompletionItem { 520 CompletionItem {
521 label: "proc_macro_derive", 521 label: "proc_macro_derive",
522 source_range: [20; 20), 522 source_range: 20..20,
523 delete: [20; 20), 523 delete: 20..20,
524 insert: "proc_macro_derive(${0:Trait})", 524 insert: "proc_macro_derive(${0:Trait})",
525 kind: Attribute, 525 kind: Attribute,
526 }, 526 },
527 CompletionItem { 527 CompletionItem {
528 label: "recursion_limit", 528 label: "recursion_limit",
529 source_range: [20; 20), 529 source_range: 20..20,
530 delete: [20; 20), 530 delete: 20..20,
531 insert: "recursion_limit = ${0:128}", 531 insert: "recursion_limit = ${0:128}",
532 kind: Attribute, 532 kind: Attribute,
533 }, 533 },
534 CompletionItem { 534 CompletionItem {
535 label: "repr", 535 label: "repr",
536 source_range: [20; 20), 536 source_range: 20..20,
537 delete: [20; 20), 537 delete: 20..20,
538 insert: "repr(${0:C})", 538 insert: "repr(${0:C})",
539 kind: Attribute, 539 kind: Attribute,
540 }, 540 },
541 CompletionItem { 541 CompletionItem {
542 label: "should_panic", 542 label: "should_panic",
543 source_range: [20; 20), 543 source_range: 20..20,
544 delete: [20; 20), 544 delete: 20..20,
545 insert: "expected = \"${0:reason}\"", 545 insert: "expected = \"${0:reason}\"",
546 kind: Attribute, 546 kind: Attribute,
547 }, 547 },
548 CompletionItem { 548 CompletionItem {
549 label: "target_feature", 549 label: "target_feature",
550 source_range: [20; 20), 550 source_range: 20..20,
551 delete: [20; 20), 551 delete: 20..20,
552 insert: "target_feature = \"${0:feature}\"", 552 insert: "target_feature = \"${0:feature}\"",
553 kind: Attribute, 553 kind: Attribute,
554 }, 554 },
555 CompletionItem { 555 CompletionItem {
556 label: "test", 556 label: "test",
557 source_range: [20; 20), 557 source_range: 20..20,
558 delete: [20; 20), 558 delete: 20..20,
559 insert: "test", 559 insert: "test",
560 kind: Attribute, 560 kind: Attribute,
561 }, 561 },
562 CompletionItem { 562 CompletionItem {
563 label: "used", 563 label: "used",
564 source_range: [20; 20), 564 source_range: 20..20,
565 delete: [20; 20), 565 delete: 20..20,
566 insert: "used", 566 insert: "used",
567 kind: Attribute, 567 kind: Attribute,
568 }, 568 },
569 CompletionItem { 569 CompletionItem {
570 label: "warn", 570 label: "warn",
571 source_range: [20; 20), 571 source_range: 20..20,
572 delete: [20; 20), 572 delete: 20..20,
573 insert: "warn(${0:lint})", 573 insert: "warn(${0:lint})",
574 kind: Attribute, 574 kind: Attribute,
575 }, 575 },
576 CompletionItem { 576 CompletionItem {
577 label: "windows_subsystem", 577 label: "windows_subsystem",
578 source_range: [20; 20), 578 source_range: 20..20,
579 delete: [20; 20), 579 delete: 20..20,
580 insert: "windows_subsystem = \"${0:subsystem}\"", 580 insert: "windows_subsystem = \"${0:subsystem}\"",
581 kind: Attribute, 581 kind: Attribute,
582 }, 582 },
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index b93153b48..814354ffa 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -94,8 +94,8 @@ mod tests {
94 [ 94 [
95 CompletionItem { 95 CompletionItem {
96 label: "the_field", 96 label: "the_field",
97 source_range: [94; 94), 97 source_range: 94..94,
98 delete: [94; 94), 98 delete: 94..94,
99 insert: "the_field", 99 insert: "the_field",
100 kind: Field, 100 kind: Field,
101 detail: "u32", 101 detail: "u32",
@@ -125,8 +125,8 @@ mod tests {
125 [ 125 [
126 CompletionItem { 126 CompletionItem {
127 label: "foo()", 127 label: "foo()",
128 source_range: [187; 187), 128 source_range: 187..187,
129 delete: [187; 187), 129 delete: 187..187,
130 insert: "foo()$0", 130 insert: "foo()$0",
131 kind: Method, 131 kind: Method,
132 lookup: "foo", 132 lookup: "foo",
@@ -134,8 +134,8 @@ mod tests {
134 }, 134 },
135 CompletionItem { 135 CompletionItem {
136 label: "the_field", 136 label: "the_field",
137 source_range: [187; 187), 137 source_range: 187..187,
138 delete: [187; 187), 138 delete: 187..187,
139 insert: "the_field", 139 insert: "the_field",
140 kind: Field, 140 kind: Field,
141 detail: "(u32,)", 141 detail: "(u32,)",
@@ -165,8 +165,8 @@ mod tests {
165 [ 165 [
166 CompletionItem { 166 CompletionItem {
167 label: "foo()", 167 label: "foo()",
168 source_range: [126; 126), 168 source_range: 126..126,
169 delete: [126; 126), 169 delete: 126..126,
170 insert: "foo()$0", 170 insert: "foo()$0",
171 kind: Method, 171 kind: Method,
172 lookup: "foo", 172 lookup: "foo",
@@ -174,8 +174,8 @@ mod tests {
174 }, 174 },
175 CompletionItem { 175 CompletionItem {
176 label: "the_field", 176 label: "the_field",
177 source_range: [126; 126), 177 source_range: 126..126,
178 delete: [126; 126), 178 delete: 126..126,
179 insert: "the_field", 179 insert: "the_field",
180 kind: Field, 180 kind: Field,
181 detail: "(u32, i32)", 181 detail: "(u32, i32)",
@@ -222,24 +222,24 @@ mod tests {
222 [ 222 [
223 CompletionItem { 223 CompletionItem {
224 label: "crate_field", 224 label: "crate_field",
225 source_range: [313; 313), 225 source_range: 313..313,
226 delete: [313; 313), 226 delete: 313..313,
227 insert: "crate_field", 227 insert: "crate_field",
228 kind: Field, 228 kind: Field,
229 detail: "u32", 229 detail: "u32",
230 }, 230 },
231 CompletionItem { 231 CompletionItem {
232 label: "pub_field", 232 label: "pub_field",
233 source_range: [313; 313), 233 source_range: 313..313,
234 delete: [313; 313), 234 delete: 313..313,
235 insert: "pub_field", 235 insert: "pub_field",
236 kind: Field, 236 kind: Field,
237 detail: "u32", 237 detail: "u32",
238 }, 238 },
239 CompletionItem { 239 CompletionItem {
240 label: "super_field", 240 label: "super_field",
241 source_range: [313; 313), 241 source_range: 313..313,
242 delete: [313; 313), 242 delete: 313..313,
243 insert: "super_field", 243 insert: "super_field",
244 kind: Field, 244 kind: Field,
245 detail: "u32", 245 detail: "u32",
@@ -267,8 +267,8 @@ mod tests {
267 [ 267 [
268 CompletionItem { 268 CompletionItem {
269 label: "the_method()", 269 label: "the_method()",
270 source_range: [144; 144), 270 source_range: 144..144,
271 delete: [144; 144), 271 delete: 144..144,
272 insert: "the_method()$0", 272 insert: "the_method()$0",
273 kind: Method, 273 kind: Method,
274 lookup: "the_method", 274 lookup: "the_method",
@@ -300,8 +300,8 @@ mod tests {
300 [ 300 [
301 CompletionItem { 301 CompletionItem {
302 label: "the_method()", 302 label: "the_method()",
303 source_range: [243; 243), 303 source_range: 243..243,
304 delete: [243; 243), 304 delete: 243..243,
305 insert: "the_method()$0", 305 insert: "the_method()$0",
306 kind: Method, 306 kind: Method,
307 lookup: "the_method", 307 lookup: "the_method",
@@ -333,8 +333,8 @@ mod tests {
333 [ 333 [
334 CompletionItem { 334 CompletionItem {
335 label: "the_method()", 335 label: "the_method()",
336 source_range: [256; 256), 336 source_range: 256..256,
337 delete: [256; 256), 337 delete: 256..256,
338 insert: "the_method()$0", 338 insert: "the_method()$0",
339 kind: Method, 339 kind: Method,
340 lookup: "the_method", 340 lookup: "the_method",
@@ -362,8 +362,8 @@ mod tests {
362 [ 362 [
363 CompletionItem { 363 CompletionItem {
364 label: "the_method()", 364 label: "the_method()",
365 source_range: [151; 151), 365 source_range: 151..151,
366 delete: [151; 151), 366 delete: 151..151,
367 insert: "the_method()$0", 367 insert: "the_method()$0",
368 kind: Method, 368 kind: Method,
369 lookup: "the_method", 369 lookup: "the_method",
@@ -391,8 +391,8 @@ mod tests {
391 [ 391 [
392 CompletionItem { 392 CompletionItem {
393 label: "the_method()", 393 label: "the_method()",
394 source_range: [155; 155), 394 source_range: 155..155,
395 delete: [155; 155), 395 delete: 155..155,
396 insert: "the_method()$0", 396 insert: "the_method()$0",
397 kind: Method, 397 kind: Method,
398 lookup: "the_method", 398 lookup: "the_method",
@@ -423,8 +423,8 @@ mod tests {
423 [ 423 [
424 CompletionItem { 424 CompletionItem {
425 label: "the_method()", 425 label: "the_method()",
426 source_range: [219; 219), 426 source_range: 219..219,
427 delete: [219; 219), 427 delete: 219..219,
428 insert: "the_method()$0", 428 insert: "the_method()$0",
429 kind: Method, 429 kind: Method,
430 lookup: "the_method", 430 lookup: "the_method",
@@ -475,8 +475,8 @@ mod tests {
475 [ 475 [
476 CompletionItem { 476 CompletionItem {
477 label: "the_method()", 477 label: "the_method()",
478 source_range: [249; 249), 478 source_range: 249..249,
479 delete: [249; 249), 479 delete: 249..249,
480 insert: "the_method()$0", 480 insert: "the_method()$0",
481 kind: Method, 481 kind: Method,
482 lookup: "the_method", 482 lookup: "the_method",
@@ -502,16 +502,16 @@ mod tests {
502 [ 502 [
503 CompletionItem { 503 CompletionItem {
504 label: "0", 504 label: "0",
505 source_range: [75; 75), 505 source_range: 75..75,
506 delete: [75; 75), 506 delete: 75..75,
507 insert: "0", 507 insert: "0",
508 kind: Field, 508 kind: Field,
509 detail: "i32", 509 detail: "i32",
510 }, 510 },
511 CompletionItem { 511 CompletionItem {
512 label: "1", 512 label: "1",
513 source_range: [75; 75), 513 source_range: 75..75,
514 delete: [75; 75), 514 delete: 75..75,
515 insert: "1", 515 insert: "1",
516 kind: Field, 516 kind: Field,
517 detail: "f64", 517 detail: "f64",
@@ -545,8 +545,8 @@ mod tests {
545 [ 545 [
546 CompletionItem { 546 CompletionItem {
547 label: "blah()", 547 label: "blah()",
548 source_range: [299; 300), 548 source_range: 299..300,
549 delete: [299; 300), 549 delete: 299..300,
550 insert: "blah()$0", 550 insert: "blah()$0",
551 kind: Method, 551 kind: Method,
552 lookup: "blah", 552 lookup: "blah",
@@ -572,8 +572,8 @@ mod tests {
572 [ 572 [
573 CompletionItem { 573 CompletionItem {
574 label: "the_field", 574 label: "the_field",
575 source_range: [106; 106), 575 source_range: 106..106,
576 delete: [106; 106), 576 delete: 106..106,
577 insert: "the_field", 577 insert: "the_field",
578 kind: Field, 578 kind: Field,
579 detail: "u32", 579 detail: "u32",
@@ -606,8 +606,8 @@ mod tests {
606 [ 606 [
607 CompletionItem { 607 CompletionItem {
608 label: "await", 608 label: "await",
609 source_range: [74; 74), 609 source_range: 74..74,
610 delete: [74; 74), 610 delete: 74..74,
611 insert: "await", 611 insert: "await",
612 detail: "expr.await", 612 detail: "expr.await",
613 }, 613 },
@@ -638,15 +638,15 @@ mod tests {
638 [ 638 [
639 CompletionItem { 639 CompletionItem {
640 label: "A", 640 label: "A",
641 source_range: [217; 217), 641 source_range: 217..217,
642 delete: [217; 217), 642 delete: 217..217,
643 insert: "A", 643 insert: "A",
644 kind: Const, 644 kind: Const,
645 }, 645 },
646 CompletionItem { 646 CompletionItem {
647 label: "b", 647 label: "b",
648 source_range: [217; 217), 648 source_range: 217..217,
649 delete: [217; 217), 649 delete: 217..217,
650 insert: "b", 650 insert: "b",
651 kind: Module, 651 kind: Module,
652 }, 652 },
@@ -671,8 +671,8 @@ mod tests {
671 [ 671 [
672 CompletionItem { 672 CompletionItem {
673 label: "the_field", 673 label: "the_field",
674 source_range: [156; 157), 674 source_range: 156..157,
675 delete: [156; 157), 675 delete: 156..157,
676 insert: "the_field", 676 insert: "the_field",
677 kind: Field, 677 kind: Field,
678 detail: "u32", 678 detail: "u32",
@@ -698,8 +698,8 @@ mod tests {
698 [ 698 [
699 CompletionItem { 699 CompletionItem {
700 label: "the_field", 700 label: "the_field",
701 source_range: [156; 157), 701 source_range: 156..157,
702 delete: [156; 157), 702 delete: 156..157,
703 insert: "the_field", 703 insert: "the_field",
704 kind: Field, 704 kind: Field,
705 detail: "u32", 705 detail: "u32",
@@ -726,8 +726,8 @@ mod tests {
726 [ 726 [
727 CompletionItem { 727 CompletionItem {
728 label: "the_field", 728 label: "the_field",
729 source_range: [156; 156), 729 source_range: 156..156,
730 delete: [156; 156), 730 delete: 156..156,
731 insert: "the_field", 731 insert: "the_field",
732 kind: Field, 732 kind: Field,
733 detail: "u32", 733 detail: "u32",
@@ -753,8 +753,8 @@ mod tests {
753 [ 753 [
754 CompletionItem { 754 CompletionItem {
755 label: "the_field", 755 label: "the_field",
756 source_range: [162; 163), 756 source_range: 162..163,
757 delete: [162; 163), 757 delete: 162..163,
758 insert: "the_field", 758 insert: "the_field",
759 kind: Field, 759 kind: Field,
760 detail: "u32", 760 detail: "u32",
@@ -790,8 +790,8 @@ mod tests {
790 [ 790 [
791 CompletionItem { 791 CompletionItem {
792 label: "the_field", 792 label: "the_field",
793 source_range: [552; 552), 793 source_range: 552..552,
794 delete: [552; 552), 794 delete: 552..552,
795 insert: "the_field", 795 insert: "the_field",
796 kind: Field, 796 kind: Field,
797 detail: "u32", 797 detail: "u32",
@@ -820,8 +820,8 @@ mod tests {
820 [ 820 [
821 CompletionItem { 821 CompletionItem {
822 label: "the_method()", 822 label: "the_method()",
823 source_range: [201; 201), 823 source_range: 201..201,
824 delete: [201; 201), 824 delete: 201..201,
825 insert: "the_method()$0", 825 insert: "the_method()$0",
826 kind: Method, 826 kind: Method,
827 lookup: "the_method", 827 lookup: "the_method",
diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs
index f84b559fc..a661932a3 100644
--- a/crates/ra_ide/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide/src/completion/complete_fn_param.rs
@@ -75,8 +75,8 @@ mod tests {
75 [ 75 [
76 CompletionItem { 76 CompletionItem {
77 label: "file_id: FileId", 77 label: "file_id: FileId",
78 source_range: [110; 114), 78 source_range: 110..114,
79 delete: [110; 114), 79 delete: 110..114,
80 insert: "file_id: FileId", 80 insert: "file_id: FileId",
81 lookup: "file_id", 81 lookup: "file_id",
82 }, 82 },
@@ -99,8 +99,8 @@ mod tests {
99 [ 99 [
100 CompletionItem { 100 CompletionItem {
101 label: "file_id: FileId", 101 label: "file_id: FileId",
102 source_range: [110; 114), 102 source_range: 110..114,
103 delete: [110; 114), 103 delete: 110..114,
104 insert: "file_id: FileId", 104 insert: "file_id: FileId",
105 lookup: "file_id", 105 lookup: "file_id",
106 }, 106 },
@@ -126,8 +126,8 @@ mod tests {
126 [ 126 [
127 CompletionItem { 127 CompletionItem {
128 label: "file_id: FileId", 128 label: "file_id: FileId",
129 source_range: [289; 293), 129 source_range: 289..293,
130 delete: [289; 293), 130 delete: 289..293,
131 insert: "file_id: FileId", 131 insert: "file_id: FileId",
132 lookup: "file_id", 132 lookup: "file_id",
133 }, 133 },
diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index adefb290e..fd95bc410 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -97,7 +97,7 @@ fn is_in_loop_body(leaf: &SyntaxToken) -> bool {
97 } 97 }
98 }; 98 };
99 if let Some(body) = loop_body { 99 if let Some(body) = loop_body {
100 if leaf.text_range().is_subrange(&body.syntax().text_range()) { 100 if body.syntax().text_range().contains_range(leaf.text_range()) {
101 return true; 101 return true;
102 } 102 }
103 } 103 }
@@ -140,22 +140,22 @@ mod tests {
140 [ 140 [
141 CompletionItem { 141 CompletionItem {
142 label: "crate", 142 label: "crate",
143 source_range: [21; 21), 143 source_range: 21..21,
144 delete: [21; 21), 144 delete: 21..21,
145 insert: "crate::", 145 insert: "crate::",
146 kind: Keyword, 146 kind: Keyword,
147 }, 147 },
148 CompletionItem { 148 CompletionItem {
149 label: "self", 149 label: "self",
150 source_range: [21; 21), 150 source_range: 21..21,
151 delete: [21; 21), 151 delete: 21..21,
152 insert: "self", 152 insert: "self",
153 kind: Keyword, 153 kind: Keyword,
154 }, 154 },
155 CompletionItem { 155 CompletionItem {
156 label: "super", 156 label: "super",
157 source_range: [21; 21), 157 source_range: 21..21,
158 delete: [21; 21), 158 delete: 21..21,
159 insert: "super::", 159 insert: "super::",
160 kind: Keyword, 160 kind: Keyword,
161 }, 161 },
@@ -173,15 +173,15 @@ mod tests {
173 [ 173 [
174 CompletionItem { 174 CompletionItem {
175 label: "self", 175 label: "self",
176 source_range: [24; 24), 176 source_range: 24..24,
177 delete: [24; 24), 177 delete: 24..24,
178 insert: "self", 178 insert: "self",
179 kind: Keyword, 179 kind: Keyword,
180 }, 180 },
181 CompletionItem { 181 CompletionItem {
182 label: "super", 182 label: "super",
183 source_range: [24; 24), 183 source_range: 24..24,
184 delete: [24; 24), 184 delete: 24..24,
185 insert: "super::", 185 insert: "super::",
186 kind: Keyword, 186 kind: Keyword,
187 }, 187 },
@@ -199,15 +199,15 @@ mod tests {
199 [ 199 [
200 CompletionItem { 200 CompletionItem {
201 label: "self", 201 label: "self",
202 source_range: [28; 28), 202 source_range: 28..28,
203 delete: [28; 28), 203 delete: 28..28,
204 insert: "self", 204 insert: "self",
205 kind: Keyword, 205 kind: Keyword,
206 }, 206 },
207 CompletionItem { 207 CompletionItem {
208 label: "super", 208 label: "super",
209 source_range: [28; 28), 209 source_range: 28..28,
210 delete: [28; 28), 210 delete: 28..28,
211 insert: "super::", 211 insert: "super::",
212 kind: Keyword, 212 kind: Keyword,
213 }, 213 },
@@ -230,36 +230,36 @@ mod tests {
230 [ 230 [
231 CompletionItem { 231 CompletionItem {
232 label: "if", 232 label: "if",
233 source_range: [49; 49), 233 source_range: 49..49,
234 delete: [49; 49), 234 delete: 49..49,
235 insert: "if $0 {}", 235 insert: "if $0 {}",
236 kind: Keyword, 236 kind: Keyword,
237 }, 237 },
238 CompletionItem { 238 CompletionItem {
239 label: "loop", 239 label: "loop",
240 source_range: [49; 49), 240 source_range: 49..49,
241 delete: [49; 49), 241 delete: 49..49,
242 insert: "loop {$0}", 242 insert: "loop {$0}",
243 kind: Keyword, 243 kind: Keyword,
244 }, 244 },
245 CompletionItem { 245 CompletionItem {
246 label: "match", 246 label: "match",
247 source_range: [49; 49), 247 source_range: 49..49,
248 delete: [49; 49), 248 delete: 49..49,
249 insert: "match $0 {}", 249 insert: "match $0 {}",
250 kind: Keyword, 250 kind: Keyword,
251 }, 251 },
252 CompletionItem { 252 CompletionItem {
253 label: "return", 253 label: "return",
254 source_range: [49; 49), 254 source_range: 49..49,
255 delete: [49; 49), 255 delete: 49..49,
256 insert: "return;", 256 insert: "return;",
257 kind: Keyword, 257 kind: Keyword,
258 }, 258 },
259 CompletionItem { 259 CompletionItem {
260 label: "while", 260 label: "while",
261 source_range: [49; 49), 261 source_range: 49..49,
262 delete: [49; 49), 262 delete: 49..49,
263 insert: "while $0 {}", 263 insert: "while $0 {}",
264 kind: Keyword, 264 kind: Keyword,
265 }, 265 },
@@ -284,50 +284,50 @@ mod tests {
284 [ 284 [
285 CompletionItem { 285 CompletionItem {
286 label: "else", 286 label: "else",
287 source_range: [108; 108), 287 source_range: 108..108,
288 delete: [108; 108), 288 delete: 108..108,
289 insert: "else {$0}", 289 insert: "else {$0}",
290 kind: Keyword, 290 kind: Keyword,
291 }, 291 },
292 CompletionItem { 292 CompletionItem {
293 label: "else if", 293 label: "else if",
294 source_range: [108; 108), 294 source_range: 108..108,
295 delete: [108; 108), 295 delete: 108..108,
296 insert: "else if $0 {}", 296 insert: "else if $0 {}",
297 kind: Keyword, 297 kind: Keyword,
298 }, 298 },
299 CompletionItem { 299 CompletionItem {
300 label: "if", 300 label: "if",
301 source_range: [108; 108), 301 source_range: 108..108,
302 delete: [108; 108), 302 delete: 108..108,
303 insert: "if $0 {}", 303 insert: "if $0 {}",
304 kind: Keyword, 304 kind: Keyword,
305 }, 305 },
306 CompletionItem { 306 CompletionItem {
307 label: "loop", 307 label: "loop",
308 source_range: [108; 108), 308 source_range: 108..108,
309 delete: [108; 108), 309 delete: 108..108,
310 insert: "loop {$0}", 310 insert: "loop {$0}",
311 kind: Keyword, 311 kind: Keyword,
312 }, 312 },
313 CompletionItem { 313 CompletionItem {
314 label: "match", 314 label: "match",
315 source_range: [108; 108), 315 source_range: 108..108,
316 delete: [108; 108), 316 delete: 108..108,
317 insert: "match $0 {}", 317 insert: "match $0 {}",
318 kind: Keyword, 318 kind: Keyword,
319 }, 319 },
320 CompletionItem { 320 CompletionItem {
321 label: "return", 321 label: "return",
322 source_range: [108; 108), 322 source_range: 108..108,
323 delete: [108; 108), 323 delete: 108..108,
324 insert: "return;", 324 insert: "return;",
325 kind: Keyword, 325 kind: Keyword,
326 }, 326 },
327 CompletionItem { 327 CompletionItem {
328 label: "while", 328 label: "while",
329 source_range: [108; 108), 329 source_range: 108..108,
330 delete: [108; 108), 330 delete: 108..108,
331 insert: "while $0 {}", 331 insert: "while $0 {}",
332 kind: Keyword, 332 kind: Keyword,
333 }, 333 },
@@ -351,36 +351,36 @@ mod tests {
351 [ 351 [
352 CompletionItem { 352 CompletionItem {
353 label: "if", 353 label: "if",
354 source_range: [56; 56), 354 source_range: 56..56,
355 delete: [56; 56), 355 delete: 56..56,
356 insert: "if $0 {}", 356 insert: "if $0 {}",
357 kind: Keyword, 357 kind: Keyword,
358 }, 358 },
359 CompletionItem { 359 CompletionItem {
360 label: "loop", 360 label: "loop",
361 source_range: [56; 56), 361 source_range: 56..56,
362 delete: [56; 56), 362 delete: 56..56,
363 insert: "loop {$0}", 363 insert: "loop {$0}",
364 kind: Keyword, 364 kind: Keyword,
365 }, 365 },
366 CompletionItem { 366 CompletionItem {
367 label: "match", 367 label: "match",
368 source_range: [56; 56), 368 source_range: 56..56,
369 delete: [56; 56), 369 delete: 56..56,
370 insert: "match $0 {}", 370 insert: "match $0 {}",
371 kind: Keyword, 371 kind: Keyword,
372 }, 372 },
373 CompletionItem { 373 CompletionItem {
374 label: "return", 374 label: "return",
375 source_range: [56; 56), 375 source_range: 56..56,
376 delete: [56; 56), 376 delete: 56..56,
377 insert: "return $0;", 377 insert: "return $0;",
378 kind: Keyword, 378 kind: Keyword,
379 }, 379 },
380 CompletionItem { 380 CompletionItem {
381 label: "while", 381 label: "while",
382 source_range: [56; 56), 382 source_range: 56..56,
383 delete: [56; 56), 383 delete: 56..56,
384 insert: "while $0 {}", 384 insert: "while $0 {}",
385 kind: Keyword, 385 kind: Keyword,
386 }, 386 },
@@ -400,36 +400,36 @@ mod tests {
400 [ 400 [
401 CompletionItem { 401 CompletionItem {
402 label: "if", 402 label: "if",
403 source_range: [49; 49), 403 source_range: 49..49,
404 delete: [49; 49), 404 delete: 49..49,
405 insert: "if $0 {}", 405 insert: "if $0 {}",
406 kind: Keyword, 406 kind: Keyword,
407 }, 407 },
408 CompletionItem { 408 CompletionItem {
409 label: "loop", 409 label: "loop",
410 source_range: [49; 49), 410 source_range: 49..49,
411 delete: [49; 49), 411 delete: 49..49,
412 insert: "loop {$0}", 412 insert: "loop {$0}",
413 kind: Keyword, 413 kind: Keyword,
414 }, 414 },
415 CompletionItem { 415 CompletionItem {
416 label: "match", 416 label: "match",
417 source_range: [49; 49), 417 source_range: 49..49,
418 delete: [49; 49), 418 delete: 49..49,
419 insert: "match $0 {}", 419 insert: "match $0 {}",
420 kind: Keyword, 420 kind: Keyword,
421 }, 421 },
422 CompletionItem { 422 CompletionItem {
423 label: "return", 423 label: "return",
424 source_range: [49; 49), 424 source_range: 49..49,
425 delete: [49; 49), 425 delete: 49..49,
426 insert: "return;", 426 insert: "return;",
427 kind: Keyword, 427 kind: Keyword,
428 }, 428 },
429 CompletionItem { 429 CompletionItem {
430 label: "while", 430 label: "while",
431 source_range: [49; 49), 431 source_range: 49..49,
432 delete: [49; 49), 432 delete: 49..49,
433 insert: "while $0 {}", 433 insert: "while $0 {}",
434 kind: Keyword, 434 kind: Keyword,
435 }, 435 },
@@ -454,36 +454,36 @@ mod tests {
454 [ 454 [
455 CompletionItem { 455 CompletionItem {
456 label: "if", 456 label: "if",
457 source_range: [97; 97), 457 source_range: 97..97,
458 delete: [97; 97), 458 delete: 97..97,
459 insert: "if $0 {}", 459 insert: "if $0 {}",
460 kind: Keyword, 460 kind: Keyword,
461 }, 461 },
462 CompletionItem { 462 CompletionItem {
463 label: "loop", 463 label: "loop",
464 source_range: [97; 97), 464 source_range: 97..97,
465 delete: [97; 97), 465 delete: 97..97,
466 insert: "loop {$0}", 466 insert: "loop {$0}",
467 kind: Keyword, 467 kind: Keyword,
468 }, 468 },
469 CompletionItem { 469 CompletionItem {
470 label: "match", 470 label: "match",
471 source_range: [97; 97), 471 source_range: 97..97,
472 delete: [97; 97), 472 delete: 97..97,
473 insert: "match $0 {}", 473 insert: "match $0 {}",
474 kind: Keyword, 474 kind: Keyword,
475 }, 475 },
476 CompletionItem { 476 CompletionItem {
477 label: "return", 477 label: "return",
478 source_range: [97; 97), 478 source_range: 97..97,
479 delete: [97; 97), 479 delete: 97..97,
480 insert: "return $0", 480 insert: "return $0",
481 kind: Keyword, 481 kind: Keyword,
482 }, 482 },
483 CompletionItem { 483 CompletionItem {
484 label: "while", 484 label: "while",
485 source_range: [97; 97), 485 source_range: 97..97,
486 delete: [97; 97), 486 delete: 97..97,
487 insert: "while $0 {}", 487 insert: "while $0 {}",
488 kind: Keyword, 488 kind: Keyword,
489 }, 489 },
@@ -508,36 +508,36 @@ mod tests {
508 [ 508 [
509 CompletionItem { 509 CompletionItem {
510 label: "if", 510 label: "if",
511 source_range: [95; 95), 511 source_range: 95..95,
512 delete: [95; 95), 512 delete: 95..95,
513 insert: "if $0 {}", 513 insert: "if $0 {}",
514 kind: Keyword, 514 kind: Keyword,
515 }, 515 },
516 CompletionItem { 516 CompletionItem {
517 label: "loop", 517 label: "loop",
518 source_range: [95; 95), 518 source_range: 95..95,
519 delete: [95; 95), 519 delete: 95..95,
520 insert: "loop {$0}", 520 insert: "loop {$0}",
521 kind: Keyword, 521 kind: Keyword,
522 }, 522 },
523 CompletionItem { 523 CompletionItem {
524 label: "match", 524 label: "match",
525 source_range: [95; 95), 525 source_range: 95..95,
526 delete: [95; 95), 526 delete: 95..95,
527 insert: "match $0 {}", 527 insert: "match $0 {}",
528 kind: Keyword, 528 kind: Keyword,
529 }, 529 },
530 CompletionItem { 530 CompletionItem {
531 label: "return", 531 label: "return",
532 source_range: [95; 95), 532 source_range: 95..95,
533 delete: [95; 95), 533 delete: 95..95,
534 insert: "return $0;", 534 insert: "return $0;",
535 kind: Keyword, 535 kind: Keyword,
536 }, 536 },
537 CompletionItem { 537 CompletionItem {
538 label: "while", 538 label: "while",
539 source_range: [95; 95), 539 source_range: 95..95,
540 delete: [95; 95), 540 delete: 95..95,
541 insert: "while $0 {}", 541 insert: "while $0 {}",
542 kind: Keyword, 542 kind: Keyword,
543 }, 543 },
@@ -560,36 +560,36 @@ mod tests {
560 [ 560 [
561 CompletionItem { 561 CompletionItem {
562 label: "if", 562 label: "if",
563 source_range: [95; 95), 563 source_range: 95..95,
564 delete: [95; 95), 564 delete: 95..95,
565 insert: "if $0 {}", 565 insert: "if $0 {}",
566 kind: Keyword, 566 kind: Keyword,
567 }, 567 },
568 CompletionItem { 568 CompletionItem {
569 label: "loop", 569 label: "loop",
570 source_range: [95; 95), 570 source_range: 95..95,
571 delete: [95; 95), 571 delete: 95..95,
572 insert: "loop {$0}", 572 insert: "loop {$0}",
573 kind: Keyword, 573 kind: Keyword,
574 }, 574 },
575 CompletionItem { 575 CompletionItem {
576 label: "match", 576 label: "match",
577 source_range: [95; 95), 577 source_range: 95..95,
578 delete: [95; 95), 578 delete: 95..95,
579 insert: "match $0 {}", 579 insert: "match $0 {}",
580 kind: Keyword, 580 kind: Keyword,
581 }, 581 },
582 CompletionItem { 582 CompletionItem {
583 label: "return", 583 label: "return",
584 source_range: [95; 95), 584 source_range: 95..95,
585 delete: [95; 95), 585 delete: 95..95,
586 insert: "return $0;", 586 insert: "return $0;",
587 kind: Keyword, 587 kind: Keyword,
588 }, 588 },
589 CompletionItem { 589 CompletionItem {
590 label: "while", 590 label: "while",
591 source_range: [95; 95), 591 source_range: 95..95,
592 delete: [95; 95), 592 delete: 95..95,
593 insert: "while $0 {}", 593 insert: "while $0 {}",
594 kind: Keyword, 594 kind: Keyword,
595 }, 595 },
@@ -612,50 +612,50 @@ mod tests {
612 [ 612 [
613 CompletionItem { 613 CompletionItem {
614 label: "break", 614 label: "break",
615 source_range: [63; 63), 615 source_range: 63..63,
616 delete: [63; 63), 616 delete: 63..63,
617 insert: "break;", 617 insert: "break;",
618 kind: Keyword, 618 kind: Keyword,
619 }, 619 },
620 CompletionItem { 620 CompletionItem {
621 label: "continue", 621 label: "continue",
622 source_range: [63; 63), 622 source_range: 63..63,
623 delete: [63; 63), 623 delete: 63..63,
624 insert: "continue;", 624 insert: "continue;",
625 kind: Keyword, 625 kind: Keyword,
626 }, 626 },
627 CompletionItem { 627 CompletionItem {
628 label: "if", 628 label: "if",
629 source_range: [63; 63), 629 source_range: 63..63,
630 delete: [63; 63), 630 delete: 63..63,
631 insert: "if $0 {}", 631 insert: "if $0 {}",
632 kind: Keyword, 632 kind: Keyword,
633 }, 633 },
634 CompletionItem { 634 CompletionItem {
635 label: "loop", 635 label: "loop",
636 source_range: [63; 63), 636 source_range: 63..63,
637 delete: [63; 63), 637 delete: 63..63,
638 insert: "loop {$0}", 638 insert: "loop {$0}",
639 kind: Keyword, 639 kind: Keyword,
640 }, 640 },
641 CompletionItem { 641 CompletionItem {
642 label: "match", 642 label: "match",
643 source_range: [63; 63), 643 source_range: 63..63,
644 delete: [63; 63), 644 delete: 63..63,
645 insert: "match $0 {}", 645 insert: "match $0 {}",
646 kind: Keyword, 646 kind: Keyword,
647 }, 647 },
648 CompletionItem { 648 CompletionItem {
649 label: "return", 649 label: "return",
650 source_range: [63; 63), 650 source_range: 63..63,
651 delete: [63; 63), 651 delete: 63..63,
652 insert: "return $0;", 652 insert: "return $0;",
653 kind: Keyword, 653 kind: Keyword,
654 }, 654 },
655 CompletionItem { 655 CompletionItem {
656 label: "while", 656 label: "while",
657 source_range: [63; 63), 657 source_range: 63..63,
658 delete: [63; 63), 658 delete: 63..63,
659 insert: "while $0 {}", 659 insert: "while $0 {}",
660 kind: Keyword, 660 kind: Keyword,
661 }, 661 },
@@ -676,36 +676,36 @@ mod tests {
676 [ 676 [
677 CompletionItem { 677 CompletionItem {
678 label: "if", 678 label: "if",
679 source_range: [68; 68), 679 source_range: 68..68,
680 delete: [68; 68), 680 delete: 68..68,
681 insert: "if $0 {}", 681 insert: "if $0 {}",
682 kind: Keyword, 682 kind: Keyword,
683 }, 683 },
684 CompletionItem { 684 CompletionItem {
685 label: "loop", 685 label: "loop",
686 source_range: [68; 68), 686 source_range: 68..68,
687 delete: [68; 68), 687 delete: 68..68,
688 insert: "loop {$0}", 688 insert: "loop {$0}",
689 kind: Keyword, 689 kind: Keyword,
690 }, 690 },
691 CompletionItem { 691 CompletionItem {
692 label: "match", 692 label: "match",
693 source_range: [68; 68), 693 source_range: 68..68,
694 delete: [68; 68), 694 delete: 68..68,
695 insert: "match $0 {}", 695 insert: "match $0 {}",
696 kind: Keyword, 696 kind: Keyword,
697 }, 697 },
698 CompletionItem { 698 CompletionItem {
699 label: "return", 699 label: "return",
700 source_range: [68; 68), 700 source_range: 68..68,
701 delete: [68; 68), 701 delete: 68..68,
702 insert: "return $0;", 702 insert: "return $0;",
703 kind: Keyword, 703 kind: Keyword,
704 }, 704 },
705 CompletionItem { 705 CompletionItem {
706 label: "while", 706 label: "while",
707 source_range: [68; 68), 707 source_range: 68..68,
708 delete: [68; 68), 708 delete: 68..68,
709 insert: "while $0 {}", 709 insert: "while $0 {}",
710 kind: Keyword, 710 kind: Keyword,
711 }, 711 },
@@ -732,50 +732,50 @@ mod tests {
732 [ 732 [
733 CompletionItem { 733 CompletionItem {
734 label: "break", 734 label: "break",
735 source_range: [122; 124), 735 source_range: 122..124,
736 delete: [122; 124), 736 delete: 122..124,
737 insert: "break", 737 insert: "break",
738 kind: Keyword, 738 kind: Keyword,
739 }, 739 },
740 CompletionItem { 740 CompletionItem {
741 label: "continue", 741 label: "continue",
742 source_range: [122; 124), 742 source_range: 122..124,
743 delete: [122; 124), 743 delete: 122..124,
744 insert: "continue", 744 insert: "continue",
745 kind: Keyword, 745 kind: Keyword,
746 }, 746 },
747 CompletionItem { 747 CompletionItem {
748 label: "if", 748 label: "if",
749 source_range: [122; 124), 749 source_range: 122..124,
750 delete: [122; 124), 750 delete: 122..124,
751 insert: "if $0 {}", 751 insert: "if $0 {}",
752 kind: Keyword, 752 kind: Keyword,
753 }, 753 },
754 CompletionItem { 754 CompletionItem {
755 label: "loop", 755 label: "loop",
756 source_range: [122; 124), 756 source_range: 122..124,
757 delete: [122; 124), 757 delete: 122..124,
758 insert: "loop {$0}", 758 insert: "loop {$0}",
759 kind: Keyword, 759 kind: Keyword,
760 }, 760 },
761 CompletionItem { 761 CompletionItem {
762 label: "match", 762 label: "match",
763 source_range: [122; 124), 763 source_range: 122..124,
764 delete: [122; 124), 764 delete: 122..124,
765 insert: "match $0 {}", 765 insert: "match $0 {}",
766 kind: Keyword, 766 kind: Keyword,
767 }, 767 },
768 CompletionItem { 768 CompletionItem {
769 label: "return", 769 label: "return",
770 source_range: [122; 124), 770 source_range: 122..124,
771 delete: [122; 124), 771 delete: 122..124,
772 insert: "return", 772 insert: "return",
773 kind: Keyword, 773 kind: Keyword,
774 }, 774 },
775 CompletionItem { 775 CompletionItem {
776 label: "while", 776 label: "while",
777 source_range: [122; 124), 777 source_range: 122..124,
778 delete: [122; 124), 778 delete: 122..124,
779 insert: "while $0 {}", 779 insert: "while $0 {}",
780 kind: Keyword, 780 kind: Keyword,
781 }, 781 },
diff --git a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
index 6000106d0..d9bb5fd25 100644
--- a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
+++ b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
@@ -42,8 +42,8 @@ mod tests {
42 [ 42 [
43 CompletionItem { 43 CompletionItem {
44 label: "foo!(…)", 44 label: "foo!(…)",
45 source_range: [46; 46), 45 source_range: 46..46,
46 delete: [46; 46), 46 delete: 46..46,
47 insert: "foo!($0)", 47 insert: "foo!($0)",
48 kind: Macro, 48 kind: Macro,
49 detail: "macro_rules! foo", 49 detail: "macro_rules! foo",
@@ -82,8 +82,8 @@ mod tests {
82 [ 82 [
83 CompletionItem { 83 CompletionItem {
84 label: "vec![…]", 84 label: "vec![…]",
85 source_range: [280; 280), 85 source_range: 280..280,
86 delete: [280; 280), 86 delete: 280..280,
87 insert: "vec![$0]", 87 insert: "vec![$0]",
88 kind: Macro, 88 kind: Macro,
89 detail: "macro_rules! vec", 89 detail: "macro_rules! vec",
@@ -119,8 +119,8 @@ mod tests {
119 [ 119 [
120 CompletionItem { 120 CompletionItem {
121 label: "foo! {…}", 121 label: "foo! {…}",
122 source_range: [163; 163), 122 source_range: 163..163,
123 delete: [163; 163), 123 delete: 163..163,
124 insert: "foo! {$0}", 124 insert: "foo! {$0}",
125 kind: Macro, 125 kind: Macro,
126 detail: "macro_rules! foo", 126 detail: "macro_rules! foo",
@@ -130,8 +130,8 @@ mod tests {
130 }, 130 },
131 CompletionItem { 131 CompletionItem {
132 label: "main()", 132 label: "main()",
133 source_range: [163; 163), 133 source_range: 163..163,
134 delete: [163; 163), 134 delete: 163..163,
135 insert: "main()$0", 135 insert: "main()$0",
136 kind: Function, 136 kind: Function,
137 lookup: "main", 137 lookup: "main",
diff --git a/crates/ra_ide/src/completion/complete_pattern.rs b/crates/ra_ide/src/completion/complete_pattern.rs
index 218829b10..fdd9e928b 100644
--- a/crates/ra_ide/src/completion/complete_pattern.rs
+++ b/crates/ra_ide/src/completion/complete_pattern.rs
@@ -63,37 +63,37 @@ mod tests {
63 [ 63 [
64 CompletionItem { 64 CompletionItem {
65 label: "Bar", 65 label: "Bar",
66 source_range: [246; 246), 66 source_range: 246..246,
67 delete: [246; 246), 67 delete: 246..246,
68 insert: "Bar", 68 insert: "Bar",
69 kind: Struct, 69 kind: Struct,
70 }, 70 },
71 CompletionItem { 71 CompletionItem {
72 label: "E", 72 label: "E",
73 source_range: [246; 246), 73 source_range: 246..246,
74 delete: [246; 246), 74 delete: 246..246,
75 insert: "E", 75 insert: "E",
76 kind: Enum, 76 kind: Enum,
77 }, 77 },
78 CompletionItem { 78 CompletionItem {
79 label: "X", 79 label: "X",
80 source_range: [246; 246), 80 source_range: 246..246,
81 delete: [246; 246), 81 delete: 246..246,
82 insert: "X", 82 insert: "X",
83 kind: EnumVariant, 83 kind: EnumVariant,
84 detail: "()", 84 detail: "()",
85 }, 85 },
86 CompletionItem { 86 CompletionItem {
87 label: "Z", 87 label: "Z",
88 source_range: [246; 246), 88 source_range: 246..246,
89 delete: [246; 246), 89 delete: 246..246,
90 insert: "Z", 90 insert: "Z",
91 kind: Const, 91 kind: Const,
92 }, 92 },
93 CompletionItem { 93 CompletionItem {
94 label: "m", 94 label: "m",
95 source_range: [246; 246), 95 source_range: 246..246,
96 delete: [246; 246), 96 delete: 246..246,
97 insert: "m", 97 insert: "m",
98 kind: Module, 98 kind: Module,
99 }, 99 },
@@ -119,15 +119,15 @@ mod tests {
119 [ 119 [
120 CompletionItem { 120 CompletionItem {
121 label: "E", 121 label: "E",
122 source_range: [151; 151), 122 source_range: 151..151,
123 delete: [151; 151), 123 delete: 151..151,
124 insert: "E", 124 insert: "E",
125 kind: Enum, 125 kind: Enum,
126 }, 126 },
127 CompletionItem { 127 CompletionItem {
128 label: "m!(…)", 128 label: "m!(…)",
129 source_range: [151; 151), 129 source_range: 151..151,
130 delete: [151; 151), 130 delete: 151..151,
131 insert: "m!($0)", 131 insert: "m!($0)",
132 kind: Macro, 132 kind: Macro,
133 detail: "macro_rules! m", 133 detail: "macro_rules! m",
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs
index 8d397b0fe..6a0f0c72e 100644
--- a/crates/ra_ide/src/completion/complete_postfix.rs
+++ b/crates/ra_ide/src/completion/complete_postfix.rs
@@ -2,7 +2,7 @@
2 2
3use ra_syntax::{ 3use ra_syntax::{
4 ast::{self, AstNode}, 4 ast::{self, AstNode},
5 TextRange, TextUnit, 5 TextRange, TextSize,
6}; 6};
7use ra_text_edit::TextEdit; 7use ra_text_edit::TextEdit;
8 8
@@ -115,7 +115,7 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
115fn get_receiver_text(receiver: &ast::Expr, receiver_is_ambiguous_float_literal: bool) -> String { 115fn get_receiver_text(receiver: &ast::Expr, receiver_is_ambiguous_float_literal: bool) -> String {
116 if receiver_is_ambiguous_float_literal { 116 if receiver_is_ambiguous_float_literal {
117 let text = receiver.syntax().text(); 117 let text = receiver.syntax().text();
118 let without_dot = ..text.len() - TextUnit::of_char('.'); 118 let without_dot = ..text.len() - TextSize::of('.');
119 text.slice(without_dot).to_string() 119 text.slice(without_dot).to_string()
120 } else { 120 } else {
121 receiver.to_string() 121 receiver.to_string()
@@ -143,7 +143,7 @@ fn postfix_snippet(
143 let edit = { 143 let edit = {
144 let receiver_syntax = receiver.syntax(); 144 let receiver_syntax = receiver.syntax();
145 let receiver_range = ctx.sema.original_range(receiver_syntax).range; 145 let receiver_range = ctx.sema.original_range(receiver_syntax).range;
146 let delete_range = TextRange::from_to(receiver_range.start(), ctx.source_range().end()); 146 let delete_range = TextRange::new(receiver_range.start(), ctx.source_range().end());
147 TextEdit::replace(delete_range, snippet.to_string()) 147 TextEdit::replace(delete_range, snippet.to_string())
148 }; 148 };
149 CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label) 149 CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label)
@@ -176,57 +176,57 @@ mod tests {
176 [ 176 [
177 CompletionItem { 177 CompletionItem {
178 label: "box", 178 label: "box",
179 source_range: [89; 89), 179 source_range: 89..89,
180 delete: [85; 89), 180 delete: 85..89,
181 insert: "Box::new(bar)", 181 insert: "Box::new(bar)",
182 detail: "Box::new(expr)", 182 detail: "Box::new(expr)",
183 }, 183 },
184 CompletionItem { 184 CompletionItem {
185 label: "dbg", 185 label: "dbg",
186 source_range: [89; 89), 186 source_range: 89..89,
187 delete: [85; 89), 187 delete: 85..89,
188 insert: "dbg!(bar)", 188 insert: "dbg!(bar)",
189 detail: "dbg!(expr)", 189 detail: "dbg!(expr)",
190 }, 190 },
191 CompletionItem { 191 CompletionItem {
192 label: "if", 192 label: "if",
193 source_range: [89; 89), 193 source_range: 89..89,
194 delete: [85; 89), 194 delete: 85..89,
195 insert: "if bar {$0}", 195 insert: "if bar {$0}",
196 detail: "if expr {}", 196 detail: "if expr {}",
197 }, 197 },
198 CompletionItem { 198 CompletionItem {
199 label: "match", 199 label: "match",
200 source_range: [89; 89), 200 source_range: 89..89,
201 delete: [85; 89), 201 delete: 85..89,
202 insert: "match bar {\n ${1:_} => {$0\\},\n}", 202 insert: "match bar {\n ${1:_} => {$0\\},\n}",
203 detail: "match expr {}", 203 detail: "match expr {}",
204 }, 204 },
205 CompletionItem { 205 CompletionItem {
206 label: "not", 206 label: "not",
207 source_range: [89; 89), 207 source_range: 89..89,
208 delete: [85; 89), 208 delete: 85..89,
209 insert: "!bar", 209 insert: "!bar",
210 detail: "!expr", 210 detail: "!expr",
211 }, 211 },
212 CompletionItem { 212 CompletionItem {
213 label: "ref", 213 label: "ref",
214 source_range: [89; 89), 214 source_range: 89..89,
215 delete: [85; 89), 215 delete: 85..89,
216 insert: "&bar", 216 insert: "&bar",
217 detail: "&expr", 217 detail: "&expr",
218 }, 218 },
219 CompletionItem { 219 CompletionItem {
220 label: "refm", 220 label: "refm",
221 source_range: [89; 89), 221 source_range: 89..89,
222 delete: [85; 89), 222 delete: 85..89,
223 insert: "&mut bar", 223 insert: "&mut bar",
224 detail: "&mut expr", 224 detail: "&mut expr",
225 }, 225 },
226 CompletionItem { 226 CompletionItem {
227 label: "while", 227 label: "while",
228 source_range: [89; 89), 228 source_range: 89..89,
229 delete: [85; 89), 229 delete: 85..89,
230 insert: "while bar {\n$0\n}", 230 insert: "while bar {\n$0\n}",
231 detail: "while expr {}", 231 detail: "while expr {}",
232 }, 232 },
@@ -250,43 +250,43 @@ mod tests {
250 [ 250 [
251 CompletionItem { 251 CompletionItem {
252 label: "box", 252 label: "box",
253 source_range: [91; 91), 253 source_range: 91..91,
254 delete: [87; 91), 254 delete: 87..91,
255 insert: "Box::new(bar)", 255 insert: "Box::new(bar)",
256 detail: "Box::new(expr)", 256 detail: "Box::new(expr)",
257 }, 257 },
258 CompletionItem { 258 CompletionItem {
259 label: "dbg", 259 label: "dbg",
260 source_range: [91; 91), 260 source_range: 91..91,
261 delete: [87; 91), 261 delete: 87..91,
262 insert: "dbg!(bar)", 262 insert: "dbg!(bar)",
263 detail: "dbg!(expr)", 263 detail: "dbg!(expr)",
264 }, 264 },
265 CompletionItem { 265 CompletionItem {
266 label: "match", 266 label: "match",
267 source_range: [91; 91), 267 source_range: 91..91,
268 delete: [87; 91), 268 delete: 87..91,
269 insert: "match bar {\n ${1:_} => {$0\\},\n}", 269 insert: "match bar {\n ${1:_} => {$0\\},\n}",
270 detail: "match expr {}", 270 detail: "match expr {}",
271 }, 271 },
272 CompletionItem { 272 CompletionItem {
273 label: "not", 273 label: "not",
274 source_range: [91; 91), 274 source_range: 91..91,
275 delete: [87; 91), 275 delete: 87..91,
276 insert: "!bar", 276 insert: "!bar",
277 detail: "!expr", 277 detail: "!expr",
278 }, 278 },
279 CompletionItem { 279 CompletionItem {
280 label: "ref", 280 label: "ref",
281 source_range: [91; 91), 281 source_range: 91..91,
282 delete: [87; 91), 282 delete: 87..91,
283 insert: "&bar", 283 insert: "&bar",
284 detail: "&expr", 284 detail: "&expr",
285 }, 285 },
286 CompletionItem { 286 CompletionItem {
287 label: "refm", 287 label: "refm",
288 source_range: [91; 91), 288 source_range: 91..91,
289 delete: [87; 91), 289 delete: 87..91,
290 insert: "&mut bar", 290 insert: "&mut bar",
291 detail: "&mut expr", 291 detail: "&mut expr",
292 }, 292 },
@@ -309,43 +309,43 @@ mod tests {
309 [ 309 [
310 CompletionItem { 310 CompletionItem {
311 label: "box", 311 label: "box",
312 source_range: [52; 52), 312 source_range: 52..52,
313 delete: [49; 52), 313 delete: 49..52,
314 insert: "Box::new(42)", 314 insert: "Box::new(42)",
315 detail: "Box::new(expr)", 315 detail: "Box::new(expr)",
316 }, 316 },
317 CompletionItem { 317 CompletionItem {
318 label: "dbg", 318 label: "dbg",
319 source_range: [52; 52), 319 source_range: 52..52,
320 delete: [49; 52), 320 delete: 49..52,
321 insert: "dbg!(42)", 321 insert: "dbg!(42)",
322 detail: "dbg!(expr)", 322 detail: "dbg!(expr)",
323 }, 323 },
324 CompletionItem { 324 CompletionItem {
325 label: "match", 325 label: "match",
326 source_range: [52; 52), 326 source_range: 52..52,
327 delete: [49; 52), 327 delete: 49..52,
328 insert: "match 42 {\n ${1:_} => {$0\\},\n}", 328 insert: "match 42 {\n ${1:_} => {$0\\},\n}",
329 detail: "match expr {}", 329 detail: "match expr {}",
330 }, 330 },
331 CompletionItem { 331 CompletionItem {
332 label: "not", 332 label: "not",
333 source_range: [52; 52), 333 source_range: 52..52,
334 delete: [49; 52), 334 delete: 49..52,
335 insert: "!42", 335 insert: "!42",
336 detail: "!expr", 336 detail: "!expr",
337 }, 337 },
338 CompletionItem { 338 CompletionItem {
339 label: "ref", 339 label: "ref",
340 source_range: [52; 52), 340 source_range: 52..52,
341 delete: [49; 52), 341 delete: 49..52,
342 insert: "&42", 342 insert: "&42",
343 detail: "&expr", 343 detail: "&expr",
344 }, 344 },
345 CompletionItem { 345 CompletionItem {
346 label: "refm", 346 label: "refm",
347 source_range: [52; 52), 347 source_range: 52..52,
348 delete: [49; 52), 348 delete: 49..52,
349 insert: "&mut 42", 349 insert: "&mut 42",
350 detail: "&mut expr", 350 detail: "&mut expr",
351 }, 351 },
@@ -370,43 +370,43 @@ mod tests {
370 [ 370 [
371 CompletionItem { 371 CompletionItem {
372 label: "box", 372 label: "box",
373 source_range: [149; 150), 373 source_range: 149..150,
374 delete: [145; 150), 374 delete: 145..150,
375 insert: "Box::new(bar)", 375 insert: "Box::new(bar)",
376 detail: "Box::new(expr)", 376 detail: "Box::new(expr)",
377 }, 377 },
378 CompletionItem { 378 CompletionItem {
379 label: "dbg", 379 label: "dbg",
380 source_range: [149; 150), 380 source_range: 149..150,
381 delete: [145; 150), 381 delete: 145..150,
382 insert: "dbg!(bar)", 382 insert: "dbg!(bar)",
383 detail: "dbg!(expr)", 383 detail: "dbg!(expr)",
384 }, 384 },
385 CompletionItem { 385 CompletionItem {
386 label: "match", 386 label: "match",
387 source_range: [149; 150), 387 source_range: 149..150,
388 delete: [145; 150), 388 delete: 145..150,
389 insert: "match bar {\n ${1:_} => {$0\\},\n}", 389 insert: "match bar {\n ${1:_} => {$0\\},\n}",
390 detail: "match expr {}", 390 detail: "match expr {}",
391 }, 391 },
392 CompletionItem { 392 CompletionItem {
393 label: "not", 393 label: "not",
394 source_range: [149; 150), 394 source_range: 149..150,
395 delete: [145; 150), 395 delete: 145..150,
396 insert: "!bar", 396 insert: "!bar",
397 detail: "!expr", 397 detail: "!expr",
398 }, 398 },
399 CompletionItem { 399 CompletionItem {
400 label: "ref", 400 label: "ref",
401 source_range: [149; 150), 401 source_range: 149..150,
402 delete: [145; 150), 402 delete: 145..150,
403 insert: "&bar", 403 insert: "&bar",
404 detail: "&expr", 404 detail: "&expr",
405 }, 405 },
406 CompletionItem { 406 CompletionItem {
407 label: "refm", 407 label: "refm",
408 source_range: [149; 150), 408 source_range: 149..150,
409 delete: [145; 150), 409 delete: 145..150,
410 insert: "&mut bar", 410 insert: "&mut bar",
411 detail: "&mut expr", 411 detail: "&mut expr",
412 }, 412 },
@@ -429,43 +429,43 @@ mod tests {
429 [ 429 [
430 CompletionItem { 430 CompletionItem {
431 label: "box", 431 label: "box",
432 source_range: [56; 56), 432 source_range: 56..56,
433 delete: [49; 56), 433 delete: 49..56,
434 insert: "Box::new(&&&&42)", 434 insert: "Box::new(&&&&42)",
435 detail: "Box::new(expr)", 435 detail: "Box::new(expr)",
436 }, 436 },
437 CompletionItem { 437 CompletionItem {
438 label: "dbg", 438 label: "dbg",
439 source_range: [56; 56), 439 source_range: 56..56,
440 delete: [49; 56), 440 delete: 49..56,
441 insert: "dbg!(&&&&42)", 441 insert: "dbg!(&&&&42)",
442 detail: "dbg!(expr)", 442 detail: "dbg!(expr)",
443 }, 443 },
444 CompletionItem { 444 CompletionItem {
445 label: "match", 445 label: "match",
446 source_range: [56; 56), 446 source_range: 56..56,
447 delete: [49; 56), 447 delete: 49..56,
448 insert: "match &&&&42 {\n ${1:_} => {$0\\},\n}", 448 insert: "match &&&&42 {\n ${1:_} => {$0\\},\n}",
449 detail: "match expr {}", 449 detail: "match expr {}",
450 }, 450 },
451 CompletionItem { 451 CompletionItem {
452 label: "not", 452 label: "not",
453 source_range: [56; 56), 453 source_range: 56..56,
454 delete: [53; 56), 454 delete: 53..56,
455 insert: "!42", 455 insert: "!42",
456 detail: "!expr", 456 detail: "!expr",
457 }, 457 },
458 CompletionItem { 458 CompletionItem {
459 label: "ref", 459 label: "ref",
460 source_range: [56; 56), 460 source_range: 56..56,
461 delete: [53; 56), 461 delete: 53..56,
462 insert: "&42", 462 insert: "&42",
463 detail: "&expr", 463 detail: "&expr",
464 }, 464 },
465 CompletionItem { 465 CompletionItem {
466 label: "refm", 466 label: "refm",
467 source_range: [56; 56), 467 source_range: 56..56,
468 delete: [53; 56), 468 delete: 53..56,
469 insert: "&mut 42", 469 insert: "&mut 42",
470 detail: "&mut expr", 470 detail: "&mut expr",
471 }, 471 },
diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index 5a5139e14..dd10f74e6 100644
--- a/crates/ra_ide/src/completion/complete_qualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -162,8 +162,8 @@ mod tests {
162 [ 162 [
163 CompletionItem { 163 CompletionItem {
164 label: "my", 164 label: "my",
165 source_range: [27; 29), 165 source_range: 27..29,
166 delete: [27; 29), 166 delete: 27..29,
167 insert: "my", 167 insert: "my",
168 kind: Module, 168 kind: Module,
169 documentation: Documentation( 169 documentation: Documentation(
@@ -193,15 +193,15 @@ mod tests {
193 [ 193 [
194 CompletionItem { 194 CompletionItem {
195 label: "Foo", 195 label: "Foo",
196 source_range: [31; 31), 196 source_range: 31..31,
197 delete: [31; 31), 197 delete: 31..31,
198 insert: "Foo", 198 insert: "Foo",
199 kind: Struct, 199 kind: Struct,
200 }, 200 },
201 CompletionItem { 201 CompletionItem {
202 label: "PublicBar", 202 label: "PublicBar",
203 source_range: [31; 31), 203 source_range: 31..31,
204 delete: [31; 31), 204 delete: 31..31,
205 insert: "PublicBar", 205 insert: "PublicBar",
206 kind: Struct, 206 kind: Struct,
207 }, 207 },
@@ -226,8 +226,8 @@ mod tests {
226 [ 226 [
227 CompletionItem { 227 CompletionItem {
228 label: "Bar", 228 label: "Bar",
229 source_range: [30; 30), 229 source_range: 30..30,
230 delete: [30; 30), 230 delete: 30..30,
231 insert: "Bar", 231 insert: "Bar",
232 kind: Struct, 232 kind: Struct,
233 }, 233 },
@@ -252,15 +252,15 @@ mod tests {
252 [ 252 [
253 CompletionItem { 253 CompletionItem {
254 label: "Spam", 254 label: "Spam",
255 source_range: [11; 13), 255 source_range: 11..13,
256 delete: [11; 13), 256 delete: 11..13,
257 insert: "Spam", 257 insert: "Spam",
258 kind: Struct, 258 kind: Struct,
259 }, 259 },
260 CompletionItem { 260 CompletionItem {
261 label: "foo", 261 label: "foo",
262 source_range: [11; 13), 262 source_range: 11..13,
263 delete: [11; 13), 263 delete: 11..13,
264 insert: "foo", 264 insert: "foo",
265 kind: Module, 265 kind: Module,
266 }, 266 },
@@ -285,15 +285,15 @@ mod tests {
285 [ 285 [
286 CompletionItem { 286 CompletionItem {
287 label: "Spam", 287 label: "Spam",
288 source_range: [12; 14), 288 source_range: 12..14,
289 delete: [12; 14), 289 delete: 12..14,
290 insert: "Spam", 290 insert: "Spam",
291 kind: Struct, 291 kind: Struct,
292 }, 292 },
293 CompletionItem { 293 CompletionItem {
294 label: "foo", 294 label: "foo",
295 source_range: [12; 14), 295 source_range: 12..14,
296 delete: [12; 14), 296 delete: 12..14,
297 insert: "foo", 297 insert: "foo",
298 kind: Module, 298 kind: Module,
299 }, 299 },
@@ -322,8 +322,8 @@ mod tests {
322 [ 322 [
323 CompletionItem { 323 CompletionItem {
324 label: "Spam", 324 label: "Spam",
325 source_range: [23; 25), 325 source_range: 23..25,
326 delete: [23; 25), 326 delete: 23..25,
327 insert: "Spam", 327 insert: "Spam",
328 kind: Struct, 328 kind: Struct,
329 }, 329 },
@@ -352,8 +352,8 @@ mod tests {
352 [ 352 [
353 CompletionItem { 353 CompletionItem {
354 label: "Bar(…)", 354 label: "Bar(…)",
355 source_range: [116; 116), 355 source_range: 116..116,
356 delete: [116; 116), 356 delete: 116..116,
357 insert: "Bar($0)", 357 insert: "Bar($0)",
358 kind: EnumVariant, 358 kind: EnumVariant,
359 lookup: "Bar", 359 lookup: "Bar",
@@ -365,8 +365,8 @@ mod tests {
365 }, 365 },
366 CompletionItem { 366 CompletionItem {
367 label: "Foo", 367 label: "Foo",
368 source_range: [116; 116), 368 source_range: 116..116,
369 delete: [116; 116), 369 delete: 116..116,
370 insert: "Foo", 370 insert: "Foo",
371 kind: EnumVariant, 371 kind: EnumVariant,
372 detail: "()", 372 detail: "()",
@@ -402,8 +402,8 @@ mod tests {
402 [ 402 [
403 CompletionItem { 403 CompletionItem {
404 label: "Bar(…)", 404 label: "Bar(…)",
405 source_range: [180; 180), 405 source_range: 180..180,
406 delete: [180; 180), 406 delete: 180..180,
407 insert: "Bar($0)", 407 insert: "Bar($0)",
408 kind: EnumVariant, 408 kind: EnumVariant,
409 lookup: "Bar", 409 lookup: "Bar",
@@ -415,8 +415,8 @@ mod tests {
415 }, 415 },
416 CompletionItem { 416 CompletionItem {
417 label: "Foo", 417 label: "Foo",
418 source_range: [180; 180), 418 source_range: 180..180,
419 delete: [180; 180), 419 delete: 180..180,
420 insert: "Foo", 420 insert: "Foo",
421 kind: EnumVariant, 421 kind: EnumVariant,
422 detail: "()", 422 detail: "()",
@@ -426,8 +426,8 @@ mod tests {
426 }, 426 },
427 CompletionItem { 427 CompletionItem {
428 label: "S(…)", 428 label: "S(…)",
429 source_range: [180; 180), 429 source_range: 180..180,
430 delete: [180; 180), 430 delete: 180..180,
431 insert: "S($0)", 431 insert: "S($0)",
432 kind: EnumVariant, 432 kind: EnumVariant,
433 lookup: "S", 433 lookup: "S",
@@ -463,8 +463,8 @@ mod tests {
463 [ 463 [
464 CompletionItem { 464 CompletionItem {
465 label: "m()", 465 label: "m()",
466 source_range: [100; 100), 466 source_range: 100..100,
467 delete: [100; 100), 467 delete: 100..100,
468 insert: "m()$0", 468 insert: "m()$0",
469 kind: Function, 469 kind: Function,
470 lookup: "m", 470 lookup: "m",
@@ -499,8 +499,8 @@ mod tests {
499 [ 499 [
500 CompletionItem { 500 CompletionItem {
501 label: "m()", 501 label: "m()",
502 source_range: [105; 105), 502 source_range: 105..105,
503 delete: [105; 105), 503 delete: 105..105,
504 insert: "m()$0", 504 insert: "m()$0",
505 kind: Method, 505 kind: Method,
506 lookup: "m", 506 lookup: "m",
@@ -535,8 +535,8 @@ mod tests {
535 [ 535 [
536 CompletionItem { 536 CompletionItem {
537 label: "C", 537 label: "C",
538 source_range: [107; 107), 538 source_range: 107..107,
539 delete: [107; 107), 539 delete: 107..107,
540 insert: "C", 540 insert: "C",
541 kind: Const, 541 kind: Const,
542 detail: "const C: i32 = 42;", 542 detail: "const C: i32 = 42;",
@@ -570,8 +570,8 @@ mod tests {
570 [ 570 [
571 CompletionItem { 571 CompletionItem {
572 label: "T", 572 label: "T",
573 source_range: [101; 101), 573 source_range: 101..101,
574 delete: [101; 101), 574 delete: 101..101,
575 insert: "T", 575 insert: "T",
576 kind: TypeAlias, 576 kind: TypeAlias,
577 detail: "type T = i32;", 577 detail: "type T = i32;",
@@ -610,24 +610,24 @@ mod tests {
610 [ 610 [
611 CompletionItem { 611 CompletionItem {
612 label: "PUBLIC_CONST", 612 label: "PUBLIC_CONST",
613 source_range: [302; 302), 613 source_range: 302..302,
614 delete: [302; 302), 614 delete: 302..302,
615 insert: "PUBLIC_CONST", 615 insert: "PUBLIC_CONST",
616 kind: Const, 616 kind: Const,
617 detail: "pub(super) const PUBLIC_CONST: u32 = 1;", 617 detail: "pub(super) const PUBLIC_CONST: u32 = 1;",
618 }, 618 },
619 CompletionItem { 619 CompletionItem {
620 label: "PublicType", 620 label: "PublicType",
621 source_range: [302; 302), 621 source_range: 302..302,
622 delete: [302; 302), 622 delete: 302..302,
623 insert: "PublicType", 623 insert: "PublicType",
624 kind: TypeAlias, 624 kind: TypeAlias,
625 detail: "pub(super) type PublicType = u32;", 625 detail: "pub(super) type PublicType = u32;",
626 }, 626 },
627 CompletionItem { 627 CompletionItem {
628 label: "public_method()", 628 label: "public_method()",
629 source_range: [302; 302), 629 source_range: 302..302,
630 delete: [302; 302), 630 delete: 302..302,
631 insert: "public_method()$0", 631 insert: "public_method()$0",
632 kind: Function, 632 kind: Function,
633 lookup: "public_method", 633 lookup: "public_method",
@@ -659,8 +659,8 @@ mod tests {
659 [ 659 [
660 CompletionItem { 660 CompletionItem {
661 label: "m()", 661 label: "m()",
662 source_range: [100; 100), 662 source_range: 100..100,
663 delete: [100; 100), 663 delete: 100..100,
664 insert: "m()$0", 664 insert: "m()$0",
665 kind: Function, 665 kind: Function,
666 lookup: "m", 666 lookup: "m",
@@ -695,8 +695,8 @@ mod tests {
695 [ 695 [
696 CompletionItem { 696 CompletionItem {
697 label: "m()", 697 label: "m()",
698 source_range: [101; 101), 698 source_range: 101..101,
699 delete: [101; 101), 699 delete: 101..101,
700 insert: "m()$0", 700 insert: "m()$0",
701 kind: Function, 701 kind: Function,
702 lookup: "m", 702 lookup: "m",
@@ -728,8 +728,8 @@ mod tests {
728 [ 728 [
729 CompletionItem { 729 CompletionItem {
730 label: "bar", 730 label: "bar",
731 source_range: [9; 9), 731 source_range: 9..9,
732 delete: [9; 9), 732 delete: 9..9,
733 insert: "bar", 733 insert: "bar",
734 kind: Module, 734 kind: Module,
735 }, 735 },
@@ -756,8 +756,8 @@ mod tests {
756 [ 756 [
757 CompletionItem { 757 CompletionItem {
758 label: "m()", 758 label: "m()",
759 source_range: [73; 73), 759 source_range: 73..73,
760 delete: [73; 73), 760 delete: 73..73,
761 insert: "m()$0", 761 insert: "m()$0",
762 kind: Function, 762 kind: Function,
763 lookup: "m", 763 lookup: "m",
@@ -792,8 +792,8 @@ mod tests {
792 [ 792 [
793 CompletionItem { 793 CompletionItem {
794 label: "m()", 794 label: "m()",
795 source_range: [99; 99), 795 source_range: 99..99,
796 delete: [99; 99), 796 delete: 99..99,
797 insert: "m()$0", 797 insert: "m()$0",
798 kind: Function, 798 kind: Function,
799 lookup: "m", 799 lookup: "m",
@@ -828,8 +828,8 @@ mod tests {
828 [ 828 [
829 CompletionItem { 829 CompletionItem {
830 label: "m()", 830 label: "m()",
831 source_range: [110; 110), 831 source_range: 110..110,
832 delete: [110; 110), 832 delete: 110..110,
833 insert: "m()$0", 833 insert: "m()$0",
834 kind: Function, 834 kind: Function,
835 lookup: "m", 835 lookup: "m",
@@ -862,8 +862,8 @@ mod tests {
862 [ 862 [
863 CompletionItem { 863 CompletionItem {
864 label: "bar()", 864 label: "bar()",
865 source_range: [185; 185), 865 source_range: 185..185,
866 delete: [185; 185), 866 delete: 185..185,
867 insert: "bar()$0", 867 insert: "bar()$0",
868 kind: Function, 868 kind: Function,
869 lookup: "bar", 869 lookup: "bar",
@@ -871,8 +871,8 @@ mod tests {
871 }, 871 },
872 CompletionItem { 872 CompletionItem {
873 label: "foo()", 873 label: "foo()",
874 source_range: [185; 185), 874 source_range: 185..185,
875 delete: [185; 185), 875 delete: 185..185,
876 insert: "foo()$0", 876 insert: "foo()$0",
877 kind: Function, 877 kind: Function,
878 lookup: "foo", 878 lookup: "foo",
@@ -902,16 +902,16 @@ mod tests {
902 [ 902 [
903 CompletionItem { 903 CompletionItem {
904 label: "foo!(…)", 904 label: "foo!(…)",
905 source_range: [179; 179), 905 source_range: 179..179,
906 delete: [179; 179), 906 delete: 179..179,
907 insert: "foo!($0)", 907 insert: "foo!($0)",
908 kind: Macro, 908 kind: Macro,
909 detail: "#[macro_export]\nmacro_rules! foo", 909 detail: "#[macro_export]\nmacro_rules! foo",
910 }, 910 },
911 CompletionItem { 911 CompletionItem {
912 label: "main()", 912 label: "main()",
913 source_range: [179; 179), 913 source_range: 179..179,
914 delete: [179; 179), 914 delete: 179..179,
915 insert: "main()$0", 915 insert: "main()$0",
916 kind: Function, 916 kind: Function,
917 lookup: "main", 917 lookup: "main",
@@ -947,22 +947,22 @@ mod tests {
947 [ 947 [
948 CompletionItem { 948 CompletionItem {
949 label: "RIGHT_CONST", 949 label: "RIGHT_CONST",
950 source_range: [57; 57), 950 source_range: 57..57,
951 delete: [57; 57), 951 delete: 57..57,
952 insert: "RIGHT_CONST", 952 insert: "RIGHT_CONST",
953 kind: Const, 953 kind: Const,
954 }, 954 },
955 CompletionItem { 955 CompletionItem {
956 label: "RightType", 956 label: "RightType",
957 source_range: [57; 57), 957 source_range: 57..57,
958 delete: [57; 57), 958 delete: 57..57,
959 insert: "RightType", 959 insert: "RightType",
960 kind: Struct, 960 kind: Struct,
961 }, 961 },
962 CompletionItem { 962 CompletionItem {
963 label: "right_fn()", 963 label: "right_fn()",
964 source_range: [57; 57), 964 source_range: 57..57,
965 delete: [57; 57), 965 delete: 57..57,
966 insert: "right_fn()$0", 966 insert: "right_fn()$0",
967 kind: Function, 967 kind: Function,
968 lookup: "right_fn", 968 lookup: "right_fn",
@@ -986,8 +986,8 @@ mod tests {
986 [ 986 [
987 CompletionItem { 987 CompletionItem {
988 label: "foo()", 988 label: "foo()",
989 source_range: [93; 94), 989 source_range: 93..94,
990 delete: [93; 94), 990 delete: 93..94,
991 insert: "foo()$0", 991 insert: "foo()$0",
992 kind: Function, 992 kind: Function,
993 lookup: "foo", 993 lookup: "foo",
@@ -995,8 +995,8 @@ mod tests {
995 }, 995 },
996 CompletionItem { 996 CompletionItem {
997 label: "main()", 997 label: "main()",
998 source_range: [93; 94), 998 source_range: 93..94,
999 delete: [93; 94), 999 delete: 93..94,
1000 insert: "main()$0", 1000 insert: "main()$0",
1001 kind: Function, 1001 kind: Function,
1002 lookup: "main", 1002 lookup: "main",
@@ -1025,15 +1025,15 @@ mod tests {
1025 [ 1025 [
1026 CompletionItem { 1026 CompletionItem {
1027 label: "z", 1027 label: "z",
1028 source_range: [57; 57), 1028 source_range: 57..57,
1029 delete: [57; 57), 1029 delete: 57..57,
1030 insert: "z", 1030 insert: "z",
1031 kind: Module, 1031 kind: Module,
1032 }, 1032 },
1033 CompletionItem { 1033 CompletionItem {
1034 label: "z()", 1034 label: "z()",
1035 source_range: [57; 57), 1035 source_range: 57..57,
1036 delete: [57; 57), 1036 delete: 57..57,
1037 insert: "z()$0", 1037 insert: "z()$0",
1038 kind: Function, 1038 kind: Function,
1039 lookup: "z", 1039 lookup: "z",
@@ -1064,8 +1064,8 @@ mod tests {
1064 [ 1064 [
1065 CompletionItem { 1065 CompletionItem {
1066 label: "new()", 1066 label: "new()",
1067 source_range: [292; 292), 1067 source_range: 292..292,
1068 delete: [292; 292), 1068 delete: 292..292,
1069 insert: "new()$0", 1069 insert: "new()$0",
1070 kind: Function, 1070 kind: Function,
1071 lookup: "new", 1071 lookup: "new",
diff --git a/crates/ra_ide/src/completion/complete_record.rs b/crates/ra_ide/src/completion/complete_record.rs
index 83a553155..b7ab654c5 100644
--- a/crates/ra_ide/src/completion/complete_record.rs
+++ b/crates/ra_ide/src/completion/complete_record.rs
@@ -44,8 +44,8 @@ mod tests {
44 [ 44 [
45 CompletionItem { 45 CompletionItem {
46 label: "foo", 46 label: "foo",
47 source_range: [117; 118), 47 source_range: 117..118,
48 delete: [117; 118), 48 delete: 117..118,
49 insert: "foo", 49 insert: "foo",
50 kind: Field, 50 kind: Field,
51 detail: "u32", 51 detail: "u32",
@@ -73,16 +73,16 @@ mod tests {
73 [ 73 [
74 CompletionItem { 74 CompletionItem {
75 label: "bar", 75 label: "bar",
76 source_range: [161; 161), 76 source_range: 161..161,
77 delete: [161; 161), 77 delete: 161..161,
78 insert: "bar", 78 insert: "bar",
79 kind: Field, 79 kind: Field,
80 detail: "()", 80 detail: "()",
81 }, 81 },
82 CompletionItem { 82 CompletionItem {
83 label: "foo", 83 label: "foo",
84 source_range: [161; 161), 84 source_range: 161..161,
85 delete: [161; 161), 85 delete: 161..161,
86 insert: "foo", 86 insert: "foo",
87 kind: Field, 87 kind: Field,
88 detail: "u32", 88 detail: "u32",
@@ -109,8 +109,8 @@ mod tests {
109 [ 109 [
110 CompletionItem { 110 CompletionItem {
111 label: "foo", 111 label: "foo",
112 source_range: [171; 172), 112 source_range: 171..172,
113 delete: [171; 172), 113 delete: 171..172,
114 insert: "foo", 114 insert: "foo",
115 kind: Field, 115 kind: Field,
116 detail: "u32", 116 detail: "u32",
@@ -145,16 +145,16 @@ mod tests {
145 [ 145 [
146 CompletionItem { 146 CompletionItem {
147 label: "bar", 147 label: "bar",
148 source_range: [372; 372), 148 source_range: 372..372,
149 delete: [372; 372), 149 delete: 372..372,
150 insert: "bar", 150 insert: "bar",
151 kind: Field, 151 kind: Field,
152 detail: "u32", 152 detail: "u32",
153 }, 153 },
154 CompletionItem { 154 CompletionItem {
155 label: "baz", 155 label: "baz",
156 source_range: [372; 372), 156 source_range: 372..372,
157 delete: [372; 372), 157 delete: 372..372,
158 insert: "baz", 158 insert: "baz",
159 kind: Field, 159 kind: Field,
160 detail: "u32", 160 detail: "u32",
@@ -190,8 +190,8 @@ mod tests {
190 [ 190 [
191 CompletionItem { 191 CompletionItem {
192 label: "the_field", 192 label: "the_field",
193 source_range: [142; 145), 193 source_range: 142..145,
194 delete: [142; 145), 194 delete: 142..145,
195 insert: "the_field", 195 insert: "the_field",
196 kind: Field, 196 kind: Field,
197 detail: "u32", 197 detail: "u32",
@@ -215,8 +215,8 @@ mod tests {
215 [ 215 [
216 CompletionItem { 216 CompletionItem {
217 label: "the_field", 217 label: "the_field",
218 source_range: [83; 86), 218 source_range: 83..86,
219 delete: [83; 86), 219 delete: 83..86,
220 insert: "the_field", 220 insert: "the_field",
221 kind: Field, 221 kind: Field,
222 detail: "u32", 222 detail: "u32",
@@ -241,8 +241,8 @@ mod tests {
241 [ 241 [
242 CompletionItem { 242 CompletionItem {
243 label: "a", 243 label: "a",
244 source_range: [119; 119), 244 source_range: 119..119,
245 delete: [119; 119), 245 delete: 119..119,
246 insert: "a", 246 insert: "a",
247 kind: Field, 247 kind: Field,
248 detail: "u32", 248 detail: "u32",
@@ -267,8 +267,8 @@ mod tests {
267 [ 267 [
268 CompletionItem { 268 CompletionItem {
269 label: "b", 269 label: "b",
270 source_range: [119; 119), 270 source_range: 119..119,
271 delete: [119; 119), 271 delete: 119..119,
272 insert: "b", 272 insert: "b",
273 kind: Field, 273 kind: Field,
274 detail: "u32", 274 detail: "u32",
@@ -292,8 +292,8 @@ mod tests {
292 [ 292 [
293 CompletionItem { 293 CompletionItem {
294 label: "a", 294 label: "a",
295 source_range: [93; 93), 295 source_range: 93..93,
296 delete: [93; 93), 296 delete: 93..93,
297 insert: "a", 297 insert: "a",
298 kind: Field, 298 kind: Field,
299 detail: "u32", 299 detail: "u32",
@@ -317,8 +317,8 @@ mod tests {
317 [ 317 [
318 CompletionItem { 318 CompletionItem {
319 label: "the_field", 319 label: "the_field",
320 source_range: [137; 140), 320 source_range: 137..140,
321 delete: [137; 140), 321 delete: 137..140,
322 insert: "the_field", 322 insert: "the_field",
323 kind: Field, 323 kind: Field,
324 detail: "u32", 324 detail: "u32",
@@ -352,16 +352,16 @@ mod tests {
352 [ 352 [
353 CompletionItem { 353 CompletionItem {
354 label: "bar", 354 label: "bar",
355 source_range: [302; 302), 355 source_range: 302..302,
356 delete: [302; 302), 356 delete: 302..302,
357 insert: "bar", 357 insert: "bar",
358 kind: Field, 358 kind: Field,
359 detail: "u32", 359 detail: "u32",
360 }, 360 },
361 CompletionItem { 361 CompletionItem {
362 label: "baz", 362 label: "baz",
363 source_range: [302; 302), 363 source_range: 302..302,
364 delete: [302; 302), 364 delete: 302..302,
365 insert: "baz", 365 insert: "baz",
366 kind: Field, 366 kind: Field,
367 detail: "u32", 367 detail: "u32",
@@ -393,8 +393,8 @@ mod tests {
393 [ 393 [
394 CompletionItem { 394 CompletionItem {
395 label: "foo2", 395 label: "foo2",
396 source_range: [221; 221), 396 source_range: 221..221,
397 delete: [221; 221), 397 delete: 221..221,
398 insert: "foo2", 398 insert: "foo2",
399 kind: Field, 399 kind: Field,
400 detail: "u32", 400 detail: "u32",
diff --git a/crates/ra_ide/src/completion/complete_snippet.rs b/crates/ra_ide/src/completion/complete_snippet.rs
index 4bccfbfed..a3f5d1b6a 100644
--- a/crates/ra_ide/src/completion/complete_snippet.rs
+++ b/crates/ra_ide/src/completion/complete_snippet.rs
@@ -67,15 +67,15 @@ mod tests {
67 [ 67 [
68 CompletionItem { 68 CompletionItem {
69 label: "pd", 69 label: "pd",
70 source_range: [17; 17), 70 source_range: 17..17,
71 delete: [17; 17), 71 delete: 17..17,
72 insert: "eprintln!(\"$0 = {:?}\", $0);", 72 insert: "eprintln!(\"$0 = {:?}\", $0);",
73 kind: Snippet, 73 kind: Snippet,
74 }, 74 },
75 CompletionItem { 75 CompletionItem {
76 label: "ppd", 76 label: "ppd",
77 source_range: [17; 17), 77 source_range: 17..17,
78 delete: [17; 17), 78 delete: 17..17,
79 insert: "eprintln!(\"$0 = {:#?}\", $0);", 79 insert: "eprintln!(\"$0 = {:#?}\", $0);",
80 kind: Snippet, 80 kind: Snippet,
81 }, 81 },
@@ -111,23 +111,23 @@ mod tests {
111 [ 111 [
112 CompletionItem { 112 CompletionItem {
113 label: "Test function", 113 label: "Test function",
114 source_range: [78; 78), 114 source_range: 78..78,
115 delete: [78; 78), 115 delete: 78..78,
116 insert: "#[test]\nfn ${1:feature}() {\n $0\n}", 116 insert: "#[test]\nfn ${1:feature}() {\n $0\n}",
117 kind: Snippet, 117 kind: Snippet,
118 lookup: "tfn", 118 lookup: "tfn",
119 }, 119 },
120 CompletionItem { 120 CompletionItem {
121 label: "macro_rules", 121 label: "macro_rules",
122 source_range: [78; 78), 122 source_range: 78..78,
123 delete: [78; 78), 123 delete: 78..78,
124 insert: "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}", 124 insert: "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}",
125 kind: Snippet, 125 kind: Snippet,
126 }, 126 },
127 CompletionItem { 127 CompletionItem {
128 label: "pub(crate)", 128 label: "pub(crate)",
129 source_range: [78; 78), 129 source_range: 78..78,
130 delete: [78; 78), 130 delete: 78..78,
131 insert: "pub(crate) $0", 131 insert: "pub(crate) $0",
132 kind: Snippet, 132 kind: Snippet,
133 }, 133 },
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index c39943252..ee32d1ff6 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -141,7 +141,7 @@ fn add_function_impl(
141 } else { 141 } else {
142 CompletionItemKind::Function 142 CompletionItemKind::Function
143 }; 143 };
144 let range = TextRange::from_to(fn_def_node.text_range().start(), ctx.source_range().end()); 144 let range = TextRange::new(fn_def_node.text_range().start(), ctx.source_range().end());
145 145
146 match ctx.config.snippet_cap { 146 match ctx.config.snippet_cap {
147 Some(cap) => { 147 Some(cap) => {
@@ -167,7 +167,7 @@ fn add_type_alias_impl(
167 167
168 let snippet = format!("type {} = ", alias_name); 168 let snippet = format!("type {} = ", alias_name);
169 169
170 let range = TextRange::from_to(type_def_node.text_range().start(), ctx.source_range().end()); 170 let range = TextRange::new(type_def_node.text_range().start(), ctx.source_range().end());
171 171
172 CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone()) 172 CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
173 .text_edit(TextEdit::replace(range, snippet)) 173 .text_edit(TextEdit::replace(range, snippet))
@@ -188,8 +188,7 @@ fn add_const_impl(
188 if let Some(const_name) = const_name { 188 if let Some(const_name) = const_name {
189 let snippet = make_const_compl_syntax(&const_.source(ctx.db).value); 189 let snippet = make_const_compl_syntax(&const_.source(ctx.db).value);
190 190
191 let range = 191 let range = TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());
192 TextRange::from_to(const_def_node.text_range().start(), ctx.source_range().end());
193 192
194 CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone()) 193 CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
195 .text_edit(TextEdit::replace(range, snippet)) 194 .text_edit(TextEdit::replace(range, snippet))
@@ -216,7 +215,7 @@ fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
216 .map_or(const_end, |f| f.text_range().start()); 215 .map_or(const_end, |f| f.text_range().start());
217 216
218 let len = end - start; 217 let len = end - start;
219 let range = TextRange::from_to(0.into(), len); 218 let range = TextRange::new(0.into(), len);
220 219
221 let syntax = const_.syntax().text().slice(range).to_string(); 220 let syntax = const_.syntax().text().slice(range).to_string();
222 221
@@ -254,24 +253,24 @@ mod tests {
254 [ 253 [
255 CompletionItem { 254 CompletionItem {
256 label: "const TEST_CONST: u16 = ", 255 label: "const TEST_CONST: u16 = ",
257 source_range: [209; 210), 256 source_range: 209..210,
258 delete: [209; 210), 257 delete: 209..210,
259 insert: "const TEST_CONST: u16 = ", 258 insert: "const TEST_CONST: u16 = ",
260 kind: Const, 259 kind: Const,
261 lookup: "TEST_CONST", 260 lookup: "TEST_CONST",
262 }, 261 },
263 CompletionItem { 262 CompletionItem {
264 label: "fn test()", 263 label: "fn test()",
265 source_range: [209; 210), 264 source_range: 209..210,
266 delete: [209; 210), 265 delete: 209..210,
267 insert: "fn test() {\n $0\n}", 266 insert: "fn test() {\n $0\n}",
268 kind: Function, 267 kind: Function,
269 lookup: "test", 268 lookup: "test",
270 }, 269 },
271 CompletionItem { 270 CompletionItem {
272 label: "type TestType = ", 271 label: "type TestType = ",
273 source_range: [209; 210), 272 source_range: 209..210,
274 delete: [209; 210), 273 delete: 209..210,
275 insert: "type TestType = ", 274 insert: "type TestType = ",
276 kind: TypeAlias, 275 kind: TypeAlias,
277 lookup: "TestType", 276 lookup: "TestType",
@@ -320,8 +319,8 @@ mod tests {
320 [ 319 [
321 CompletionItem { 320 CompletionItem {
322 label: "fn test()", 321 label: "fn test()",
323 source_range: [139; 140), 322 source_range: 139..140,
324 delete: [139; 140), 323 delete: 139..140,
325 insert: "fn test() {\n $0\n}", 324 insert: "fn test() {\n $0\n}",
326 kind: Function, 325 kind: Function,
327 lookup: "test", 326 lookup: "test",
@@ -349,8 +348,8 @@ mod tests {
349 [ 348 [
350 CompletionItem { 349 CompletionItem {
351 label: "fn foo()", 350 label: "fn foo()",
352 source_range: [141; 142), 351 source_range: 141..142,
353 delete: [138; 142), 352 delete: 138..142,
354 insert: "fn foo() {\n $0\n}", 353 insert: "fn foo() {\n $0\n}",
355 kind: Function, 354 kind: Function,
356 lookup: "foo", 355 lookup: "foo",
@@ -381,8 +380,8 @@ mod tests {
381 [ 380 [
382 CompletionItem { 381 CompletionItem {
383 label: "fn foo_bar()", 382 label: "fn foo_bar()",
384 source_range: [200; 201), 383 source_range: 200..201,
385 delete: [197; 201), 384 delete: 197..201,
386 insert: "fn foo_bar() {\n $0\n}", 385 insert: "fn foo_bar() {\n $0\n}",
387 kind: Function, 386 kind: Function,
388 lookup: "foo_bar", 387 lookup: "foo_bar",
@@ -432,8 +431,8 @@ mod tests {
432 [ 431 [
433 CompletionItem { 432 CompletionItem {
434 label: "fn foo()", 433 label: "fn foo()",
435 source_range: [144; 145), 434 source_range: 144..145,
436 delete: [141; 145), 435 delete: 141..145,
437 insert: "fn foo<T>() {\n $0\n}", 436 insert: "fn foo<T>() {\n $0\n}",
438 kind: Function, 437 kind: Function,
439 lookup: "foo", 438 lookup: "foo",
@@ -461,8 +460,8 @@ mod tests {
461 [ 460 [
462 CompletionItem { 461 CompletionItem {
463 label: "fn foo()", 462 label: "fn foo()",
464 source_range: [166; 167), 463 source_range: 166..167,
465 delete: [163; 167), 464 delete: 163..167,
466 insert: "fn foo<T>()\nwhere T: Into<String> {\n $0\n}", 465 insert: "fn foo<T>()\nwhere T: Into<String> {\n $0\n}",
467 kind: Function, 466 kind: Function,
468 lookup: "foo", 467 lookup: "foo",
@@ -488,8 +487,8 @@ mod tests {
488 [ 487 [
489 CompletionItem { 488 CompletionItem {
490 label: "type SomeType = ", 489 label: "type SomeType = ",
491 source_range: [124; 125), 490 source_range: 124..125,
492 delete: [119; 125), 491 delete: 119..125,
493 insert: "type SomeType = ", 492 insert: "type SomeType = ",
494 kind: TypeAlias, 493 kind: TypeAlias,
495 lookup: "SomeType", 494 lookup: "SomeType",
@@ -515,8 +514,8 @@ mod tests {
515 [ 514 [
516 CompletionItem { 515 CompletionItem {
517 label: "const SOME_CONST: u16 = ", 516 label: "const SOME_CONST: u16 = ",
518 source_range: [133; 134), 517 source_range: 133..134,
519 delete: [127; 134), 518 delete: 127..134,
520 insert: "const SOME_CONST: u16 = ", 519 insert: "const SOME_CONST: u16 = ",
521 kind: Const, 520 kind: Const,
522 lookup: "SOME_CONST", 521 lookup: "SOME_CONST",
@@ -542,8 +541,8 @@ mod tests {
542 [ 541 [
543 CompletionItem { 542 CompletionItem {
544 label: "const SOME_CONST: u16 = ", 543 label: "const SOME_CONST: u16 = ",
545 source_range: [138; 139), 544 source_range: 138..139,
546 delete: [132; 139), 545 delete: 132..139,
547 insert: "const SOME_CONST: u16 = ", 546 insert: "const SOME_CONST: u16 = ",
548 kind: Const, 547 kind: Const,
549 lookup: "SOME_CONST", 548 lookup: "SOME_CONST",
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index 8e3dcf96e..56cd086c6 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -85,8 +85,8 @@ mod tests {
85 [ 85 [
86 CompletionItem { 86 CompletionItem {
87 label: "collections", 87 label: "collections",
88 source_range: [21; 24), 88 source_range: 21..24,
89 delete: [21; 24), 89 delete: 21..24,
90 insert: "collections", 90 insert: "collections",
91 }, 91 },
92 ] 92 ]
@@ -157,8 +157,8 @@ mod tests {
157 [ 157 [
158 CompletionItem { 158 CompletionItem {
159 label: "Enum", 159 label: "Enum",
160 source_range: [231; 233), 160 source_range: 231..233,
161 delete: [231; 233), 161 delete: 231..233,
162 insert: "Enum", 162 insert: "Enum",
163 kind: Enum, 163 kind: Enum,
164 }, 164 },
@@ -183,8 +183,8 @@ mod tests {
183 [ 183 [
184 CompletionItem { 184 CompletionItem {
185 label: "quux(…)", 185 label: "quux(…)",
186 source_range: [91; 91), 186 source_range: 91..91,
187 delete: [91; 91), 187 delete: 91..91,
188 insert: "quux(${1:x})$0", 188 insert: "quux(${1:x})$0",
189 kind: Function, 189 kind: Function,
190 lookup: "quux", 190 lookup: "quux",
@@ -193,16 +193,16 @@ mod tests {
193 }, 193 },
194 CompletionItem { 194 CompletionItem {
195 label: "x", 195 label: "x",
196 source_range: [91; 91), 196 source_range: 91..91,
197 delete: [91; 91), 197 delete: 91..91,
198 insert: "x", 198 insert: "x",
199 kind: Binding, 199 kind: Binding,
200 detail: "i32", 200 detail: "i32",
201 }, 201 },
202 CompletionItem { 202 CompletionItem {
203 label: "y", 203 label: "y",
204 source_range: [91; 91), 204 source_range: 91..91,
205 delete: [91; 91), 205 delete: 91..91,
206 insert: "y", 206 insert: "y",
207 kind: Binding, 207 kind: Binding,
208 detail: "i32", 208 detail: "i32",
@@ -232,23 +232,23 @@ mod tests {
232 [ 232 [
233 CompletionItem { 233 CompletionItem {
234 label: "a", 234 label: "a",
235 source_range: [242; 242), 235 source_range: 242..242,
236 delete: [242; 242), 236 delete: 242..242,
237 insert: "a", 237 insert: "a",
238 kind: Binding, 238 kind: Binding,
239 }, 239 },
240 CompletionItem { 240 CompletionItem {
241 label: "b", 241 label: "b",
242 source_range: [242; 242), 242 source_range: 242..242,
243 delete: [242; 242), 243 delete: 242..242,
244 insert: "b", 244 insert: "b",
245 kind: Binding, 245 kind: Binding,
246 detail: "i32", 246 detail: "i32",
247 }, 247 },
248 CompletionItem { 248 CompletionItem {
249 label: "quux()", 249 label: "quux()",
250 source_range: [242; 242), 250 source_range: 242..242,
251 delete: [242; 242), 251 delete: 242..242,
252 insert: "quux()$0", 252 insert: "quux()$0",
253 kind: Function, 253 kind: Function,
254 lookup: "quux", 254 lookup: "quux",
@@ -275,8 +275,8 @@ mod tests {
275 [ 275 [
276 CompletionItem { 276 CompletionItem {
277 label: "quux()", 277 label: "quux()",
278 source_range: [95; 95), 278 source_range: 95..95,
279 delete: [95; 95), 279 delete: 95..95,
280 insert: "quux()$0", 280 insert: "quux()$0",
281 kind: Function, 281 kind: Function,
282 lookup: "quux", 282 lookup: "quux",
@@ -284,8 +284,8 @@ mod tests {
284 }, 284 },
285 CompletionItem { 285 CompletionItem {
286 label: "x", 286 label: "x",
287 source_range: [95; 95), 287 source_range: 95..95,
288 delete: [95; 95), 288 delete: 95..95,
289 insert: "x", 289 insert: "x",
290 kind: Binding, 290 kind: Binding,
291 }, 291 },
@@ -308,15 +308,15 @@ mod tests {
308 [ 308 [
309 CompletionItem { 309 CompletionItem {
310 label: "T", 310 label: "T",
311 source_range: [52; 52), 311 source_range: 52..52,
312 delete: [52; 52), 312 delete: 52..52,
313 insert: "T", 313 insert: "T",
314 kind: TypeParam, 314 kind: TypeParam,
315 }, 315 },
316 CompletionItem { 316 CompletionItem {
317 label: "quux()", 317 label: "quux()",
318 source_range: [52; 52), 318 source_range: 52..52,
319 delete: [52; 52), 319 delete: 52..52,
320 insert: "quux()$0", 320 insert: "quux()$0",
321 kind: Function, 321 kind: Function,
322 lookup: "quux", 322 lookup: "quux",
@@ -341,22 +341,22 @@ mod tests {
341 [ 341 [
342 CompletionItem { 342 CompletionItem {
343 label: "Self", 343 label: "Self",
344 source_range: [54; 54), 344 source_range: 54..54,
345 delete: [54; 54), 345 delete: 54..54,
346 insert: "Self", 346 insert: "Self",
347 kind: TypeParam, 347 kind: TypeParam,
348 }, 348 },
349 CompletionItem { 349 CompletionItem {
350 label: "T", 350 label: "T",
351 source_range: [54; 54), 351 source_range: 54..54,
352 delete: [54; 54), 352 delete: 54..54,
353 insert: "T", 353 insert: "T",
354 kind: TypeParam, 354 kind: TypeParam,
355 }, 355 },
356 CompletionItem { 356 CompletionItem {
357 label: "X<…>", 357 label: "X<…>",
358 source_range: [54; 54), 358 source_range: 54..54,
359 delete: [54; 54), 359 delete: 54..54,
360 insert: "X<$0>", 360 insert: "X<$0>",
361 kind: Struct, 361 kind: Struct,
362 lookup: "X", 362 lookup: "X",
@@ -380,15 +380,15 @@ mod tests {
380 [ 380 [
381 CompletionItem { 381 CompletionItem {
382 label: "Self", 382 label: "Self",
383 source_range: [48; 48), 383 source_range: 48..48,
384 delete: [48; 48), 384 delete: 48..48,
385 insert: "Self", 385 insert: "Self",
386 kind: TypeParam, 386 kind: TypeParam,
387 }, 387 },
388 CompletionItem { 388 CompletionItem {
389 label: "X", 389 label: "X",
390 source_range: [48; 48), 390 source_range: 48..48,
391 delete: [48; 48), 391 delete: 48..48,
392 insert: "X", 392 insert: "X",
393 kind: Enum, 393 kind: Enum,
394 }, 394 },
@@ -413,22 +413,22 @@ mod tests {
413 [ 413 [
414 CompletionItem { 414 CompletionItem {
415 label: "Baz", 415 label: "Baz",
416 source_range: [105; 105), 416 source_range: 105..105,
417 delete: [105; 105), 417 delete: 105..105,
418 insert: "Baz", 418 insert: "Baz",
419 kind: Enum, 419 kind: Enum,
420 }, 420 },
421 CompletionItem { 421 CompletionItem {
422 label: "Foo", 422 label: "Foo",
423 source_range: [105; 105), 423 source_range: 105..105,
424 delete: [105; 105), 424 delete: 105..105,
425 insert: "Foo", 425 insert: "Foo",
426 kind: Struct, 426 kind: Struct,
427 }, 427 },
428 CompletionItem { 428 CompletionItem {
429 label: "quux()", 429 label: "quux()",
430 source_range: [105; 105), 430 source_range: 105..105,
431 delete: [105; 105), 431 delete: 105..105,
432 insert: "quux()$0", 432 insert: "quux()$0",
433 kind: Function, 433 kind: Function,
434 lookup: "quux", 434 lookup: "quux",
@@ -455,8 +455,8 @@ mod tests {
455 [ 455 [
456 CompletionItem { 456 CompletionItem {
457 label: "other_crate", 457 label: "other_crate",
458 source_range: [4; 4), 458 source_range: 4..4,
459 delete: [4; 4), 459 delete: 4..4,
460 insert: "other_crate", 460 insert: "other_crate",
461 kind: Module, 461 kind: Module,
462 }, 462 },
@@ -481,15 +481,15 @@ mod tests {
481 [ 481 [
482 CompletionItem { 482 CompletionItem {
483 label: "Bar", 483 label: "Bar",
484 source_range: [117; 117), 484 source_range: 117..117,
485 delete: [117; 117), 485 delete: 117..117,
486 insert: "Bar", 486 insert: "Bar",
487 kind: Struct, 487 kind: Struct,
488 }, 488 },
489 CompletionItem { 489 CompletionItem {
490 label: "quux()", 490 label: "quux()",
491 source_range: [117; 117), 491 source_range: 117..117,
492 delete: [117; 117), 492 delete: 117..117,
493 insert: "quux()$0", 493 insert: "quux()$0",
494 kind: Function, 494 kind: Function,
495 lookup: "quux", 495 lookup: "quux",
@@ -513,15 +513,15 @@ mod tests {
513 [ 513 [
514 CompletionItem { 514 CompletionItem {
515 label: "Foo", 515 label: "Foo",
516 source_range: [55; 55), 516 source_range: 55..55,
517 delete: [55; 55), 517 delete: 55..55,
518 insert: "Foo", 518 insert: "Foo",
519 kind: Struct, 519 kind: Struct,
520 }, 520 },
521 CompletionItem { 521 CompletionItem {
522 label: "x()", 522 label: "x()",
523 source_range: [55; 55), 523 source_range: 55..55,
524 delete: [55; 55), 524 delete: 55..55,
525 insert: "x()$0", 525 insert: "x()$0",
526 kind: Function, 526 kind: Function,
527 lookup: "x", 527 lookup: "x",
@@ -550,16 +550,16 @@ mod tests {
550 [ 550 [
551 CompletionItem { 551 CompletionItem {
552 label: "bar", 552 label: "bar",
553 source_range: [146; 146), 553 source_range: 146..146,
554 delete: [146; 146), 554 delete: 146..146,
555 insert: "bar", 555 insert: "bar",
556 kind: Binding, 556 kind: Binding,
557 detail: "i32", 557 detail: "i32",
558 }, 558 },
559 CompletionItem { 559 CompletionItem {
560 label: "foo()", 560 label: "foo()",
561 source_range: [146; 146), 561 source_range: 146..146,
562 delete: [146; 146), 562 delete: 146..146,
563 insert: "foo()$0", 563 insert: "foo()$0",
564 kind: Function, 564 kind: Function,
565 lookup: "foo", 565 lookup: "foo",
@@ -578,15 +578,15 @@ mod tests {
578 [ 578 [
579 CompletionItem { 579 CompletionItem {
580 label: "Self", 580 label: "Self",
581 source_range: [25; 25), 581 source_range: 25..25,
582 delete: [25; 25), 582 delete: 25..25,
583 insert: "Self", 583 insert: "Self",
584 kind: TypeParam, 584 kind: TypeParam,
585 }, 585 },
586 CompletionItem { 586 CompletionItem {
587 label: "self", 587 label: "self",
588 source_range: [25; 25), 588 source_range: 25..25,
589 delete: [25; 25), 589 delete: 25..25,
590 insert: "self", 590 insert: "self",
591 kind: Binding, 591 kind: Binding,
592 detail: "&{unknown}", 592 detail: "&{unknown}",
@@ -617,15 +617,15 @@ mod tests {
617 [ 617 [
618 CompletionItem { 618 CompletionItem {
619 label: "Option", 619 label: "Option",
620 source_range: [18; 18), 620 source_range: 18..18,
621 delete: [18; 18), 621 delete: 18..18,
622 insert: "Option", 622 insert: "Option",
623 kind: Struct, 623 kind: Struct,
624 }, 624 },
625 CompletionItem { 625 CompletionItem {
626 label: "foo()", 626 label: "foo()",
627 source_range: [18; 18), 627 source_range: 18..18,
628 delete: [18; 18), 628 delete: 18..18,
629 insert: "foo()$0", 629 insert: "foo()$0",
630 kind: Function, 630 kind: Function,
631 lookup: "foo", 631 lookup: "foo",
@@ -633,8 +633,8 @@ mod tests {
633 }, 633 },
634 CompletionItem { 634 CompletionItem {
635 label: "std", 635 label: "std",
636 source_range: [18; 18), 636 source_range: 18..18,
637 delete: [18; 18), 637 delete: 18..18,
638 insert: "std", 638 insert: "std",
639 kind: Module, 639 kind: Module,
640 }, 640 },
@@ -672,22 +672,22 @@ mod tests {
672 [ 672 [
673 CompletionItem { 673 CompletionItem {
674 label: "String", 674 label: "String",
675 source_range: [18; 18), 675 source_range: 18..18,
676 delete: [18; 18), 676 delete: 18..18,
677 insert: "String", 677 insert: "String",
678 kind: Struct, 678 kind: Struct,
679 }, 679 },
680 CompletionItem { 680 CompletionItem {
681 label: "core", 681 label: "core",
682 source_range: [18; 18), 682 source_range: 18..18,
683 delete: [18; 18), 683 delete: 18..18,
684 insert: "core", 684 insert: "core",
685 kind: Module, 685 kind: Module,
686 }, 686 },
687 CompletionItem { 687 CompletionItem {
688 label: "foo()", 688 label: "foo()",
689 source_range: [18; 18), 689 source_range: 18..18,
690 delete: [18; 18), 690 delete: 18..18,
691 insert: "foo()$0", 691 insert: "foo()$0",
692 kind: Function, 692 kind: Function,
693 lookup: "foo", 693 lookup: "foo",
@@ -695,8 +695,8 @@ mod tests {
695 }, 695 },
696 CompletionItem { 696 CompletionItem {
697 label: "std", 697 label: "std",
698 source_range: [18; 18), 698 source_range: 18..18,
699 delete: [18; 18), 699 delete: 18..18,
700 insert: "std", 700 insert: "std",
701 kind: Module, 701 kind: Module,
702 }, 702 },
@@ -742,46 +742,46 @@ mod tests {
742 [ 742 [
743 CompletionItem { 743 CompletionItem {
744 label: "bar!(…)", 744 label: "bar!(…)",
745 source_range: [252; 252), 745 source_range: 252..252,
746 delete: [252; 252), 746 delete: 252..252,
747 insert: "bar!($0)", 747 insert: "bar!($0)",
748 kind: Macro, 748 kind: Macro,
749 detail: "macro_rules! bar", 749 detail: "macro_rules! bar",
750 }, 750 },
751 CompletionItem { 751 CompletionItem {
752 label: "baz!(…)", 752 label: "baz!(…)",
753 source_range: [252; 252), 753 source_range: 252..252,
754 delete: [252; 252), 754 delete: 252..252,
755 insert: "baz!($0)", 755 insert: "baz!($0)",
756 kind: Macro, 756 kind: Macro,
757 detail: "#[macro_export]\nmacro_rules! baz", 757 detail: "#[macro_export]\nmacro_rules! baz",
758 }, 758 },
759 CompletionItem { 759 CompletionItem {
760 label: "foo!(…)", 760 label: "foo!(…)",
761 source_range: [252; 252), 761 source_range: 252..252,
762 delete: [252; 252), 762 delete: 252..252,
763 insert: "foo!($0)", 763 insert: "foo!($0)",
764 kind: Macro, 764 kind: Macro,
765 detail: "macro_rules! foo", 765 detail: "macro_rules! foo",
766 }, 766 },
767 CompletionItem { 767 CompletionItem {
768 label: "m1", 768 label: "m1",
769 source_range: [252; 252), 769 source_range: 252..252,
770 delete: [252; 252), 770 delete: 252..252,
771 insert: "m1", 771 insert: "m1",
772 kind: Module, 772 kind: Module,
773 }, 773 },
774 CompletionItem { 774 CompletionItem {
775 label: "m2", 775 label: "m2",
776 source_range: [252; 252), 776 source_range: 252..252,
777 delete: [252; 252), 777 delete: 252..252,
778 insert: "m2", 778 insert: "m2",
779 kind: Module, 779 kind: Module,
780 }, 780 },
781 CompletionItem { 781 CompletionItem {
782 label: "main()", 782 label: "main()",
783 source_range: [252; 252), 783 source_range: 252..252,
784 delete: [252; 252), 784 delete: 252..252,
785 insert: "main()$0", 785 insert: "main()$0",
786 kind: Function, 786 kind: Function,
787 lookup: "main", 787 lookup: "main",
@@ -811,16 +811,16 @@ mod tests {
811 [ 811 [
812 CompletionItem { 812 CompletionItem {
813 label: "foo!(…)", 813 label: "foo!(…)",
814 source_range: [49; 49), 814 source_range: 49..49,
815 delete: [49; 49), 815 delete: 49..49,
816 insert: "foo!($0)", 816 insert: "foo!($0)",
817 kind: Macro, 817 kind: Macro,
818 detail: "macro_rules! foo", 818 detail: "macro_rules! foo",
819 }, 819 },
820 CompletionItem { 820 CompletionItem {
821 label: "foo()", 821 label: "foo()",
822 source_range: [49; 49), 822 source_range: 49..49,
823 delete: [49; 49), 823 delete: 49..49,
824 insert: "foo()$0", 824 insert: "foo()$0",
825 kind: Function, 825 kind: Function,
826 lookup: "foo", 826 lookup: "foo",
@@ -850,16 +850,16 @@ mod tests {
850 [ 850 [
851 CompletionItem { 851 CompletionItem {
852 label: "foo!(…)", 852 label: "foo!(…)",
853 source_range: [57; 57), 853 source_range: 57..57,
854 delete: [57; 57), 854 delete: 57..57,
855 insert: "foo!($0)", 855 insert: "foo!($0)",
856 kind: Macro, 856 kind: Macro,
857 detail: "macro_rules! foo", 857 detail: "macro_rules! foo",
858 }, 858 },
859 CompletionItem { 859 CompletionItem {
860 label: "main()", 860 label: "main()",
861 source_range: [57; 57), 861 source_range: 57..57,
862 delete: [57; 57), 862 delete: 57..57,
863 insert: "main()$0", 863 insert: "main()$0",
864 kind: Function, 864 kind: Function,
865 lookup: "main", 865 lookup: "main",
@@ -889,16 +889,16 @@ mod tests {
889 [ 889 [
890 CompletionItem { 890 CompletionItem {
891 label: "foo!(…)", 891 label: "foo!(…)",
892 source_range: [50; 50), 892 source_range: 50..50,
893 delete: [50; 50), 893 delete: 50..50,
894 insert: "foo!($0)", 894 insert: "foo!($0)",
895 kind: Macro, 895 kind: Macro,
896 detail: "macro_rules! foo", 896 detail: "macro_rules! foo",
897 }, 897 },
898 CompletionItem { 898 CompletionItem {
899 label: "main()", 899 label: "main()",
900 source_range: [50; 50), 900 source_range: 50..50,
901 delete: [50; 50), 901 delete: 50..50,
902 insert: "main()$0", 902 insert: "main()$0",
903 kind: Function, 903 kind: Function,
904 lookup: "main", 904 lookup: "main",
@@ -925,8 +925,8 @@ mod tests {
925 [ 925 [
926 CompletionItem { 926 CompletionItem {
927 label: "frobnicate()", 927 label: "frobnicate()",
928 source_range: [23; 24), 928 source_range: 23..24,
929 delete: [23; 24), 929 delete: 23..24,
930 insert: "frobnicate()$0", 930 insert: "frobnicate()$0",
931 kind: Function, 931 kind: Function,
932 lookup: "frobnicate", 932 lookup: "frobnicate",
@@ -934,8 +934,8 @@ mod tests {
934 }, 934 },
935 CompletionItem { 935 CompletionItem {
936 label: "main()", 936 label: "main()",
937 source_range: [23; 24), 937 source_range: 23..24,
938 delete: [23; 24), 938 delete: 23..24,
939 insert: "main()$0", 939 insert: "main()$0",
940 kind: Function, 940 kind: Function,
941 lookup: "main", 941 lookup: "main",
@@ -962,16 +962,16 @@ mod tests {
962 [ 962 [
963 CompletionItem { 963 CompletionItem {
964 label: "m!(…)", 964 label: "m!(…)",
965 source_range: [145; 145), 965 source_range: 145..145,
966 delete: [145; 145), 966 delete: 145..145,
967 insert: "m!($0)", 967 insert: "m!($0)",
968 kind: Macro, 968 kind: Macro,
969 detail: "macro_rules! m", 969 detail: "macro_rules! m",
970 }, 970 },
971 CompletionItem { 971 CompletionItem {
972 label: "quux(…)", 972 label: "quux(…)",
973 source_range: [145; 145), 973 source_range: 145..145,
974 delete: [145; 145), 974 delete: 145..145,
975 insert: "quux(${1:x})$0", 975 insert: "quux(${1:x})$0",
976 kind: Function, 976 kind: Function,
977 lookup: "quux", 977 lookup: "quux",
@@ -980,16 +980,16 @@ mod tests {
980 }, 980 },
981 CompletionItem { 981 CompletionItem {
982 label: "x", 982 label: "x",
983 source_range: [145; 145), 983 source_range: 145..145,
984 delete: [145; 145), 984 delete: 145..145,
985 insert: "x", 985 insert: "x",
986 kind: Binding, 986 kind: Binding,
987 detail: "i32", 987 detail: "i32",
988 }, 988 },
989 CompletionItem { 989 CompletionItem {
990 label: "y", 990 label: "y",
991 source_range: [145; 145), 991 source_range: 145..145,
992 delete: [145; 145), 992 delete: 145..145,
993 insert: "y", 993 insert: "y",
994 kind: Binding, 994 kind: Binding,
995 detail: "i32", 995 detail: "i32",
@@ -1015,16 +1015,16 @@ mod tests {
1015 [ 1015 [
1016 CompletionItem { 1016 CompletionItem {
1017 label: "m!(…)", 1017 label: "m!(…)",
1018 source_range: [145; 146), 1018 source_range: 145..146,
1019 delete: [145; 146), 1019 delete: 145..146,
1020 insert: "m!($0)", 1020 insert: "m!($0)",
1021 kind: Macro, 1021 kind: Macro,
1022 detail: "macro_rules! m", 1022 detail: "macro_rules! m",
1023 }, 1023 },
1024 CompletionItem { 1024 CompletionItem {
1025 label: "quux(…)", 1025 label: "quux(…)",
1026 source_range: [145; 146), 1026 source_range: 145..146,
1027 delete: [145; 146), 1027 delete: 145..146,
1028 insert: "quux(${1:x})$0", 1028 insert: "quux(${1:x})$0",
1029 kind: Function, 1029 kind: Function,
1030 lookup: "quux", 1030 lookup: "quux",
@@ -1033,16 +1033,16 @@ mod tests {
1033 }, 1033 },
1034 CompletionItem { 1034 CompletionItem {
1035 label: "x", 1035 label: "x",
1036 source_range: [145; 146), 1036 source_range: 145..146,
1037 delete: [145; 146), 1037 delete: 145..146,
1038 insert: "x", 1038 insert: "x",
1039 kind: Binding, 1039 kind: Binding,
1040 detail: "i32", 1040 detail: "i32",
1041 }, 1041 },
1042 CompletionItem { 1042 CompletionItem {
1043 label: "y", 1043 label: "y",
1044 source_range: [145; 146), 1044 source_range: 145..146,
1045 delete: [145; 146), 1045 delete: 145..146,
1046 insert: "y", 1046 insert: "y",
1047 kind: Binding, 1047 kind: Binding,
1048 detail: "i32", 1048 detail: "i32",
@@ -1068,16 +1068,16 @@ mod tests {
1068 [ 1068 [
1069 CompletionItem { 1069 CompletionItem {
1070 label: "m!(…)", 1070 label: "m!(…)",
1071 source_range: [145; 146), 1071 source_range: 145..146,
1072 delete: [145; 146), 1072 delete: 145..146,
1073 insert: "m!($0)", 1073 insert: "m!($0)",
1074 kind: Macro, 1074 kind: Macro,
1075 detail: "macro_rules! m", 1075 detail: "macro_rules! m",
1076 }, 1076 },
1077 CompletionItem { 1077 CompletionItem {
1078 label: "quux(…)", 1078 label: "quux(…)",
1079 source_range: [145; 146), 1079 source_range: 145..146,
1080 delete: [145; 146), 1080 delete: 145..146,
1081 insert: "quux(${1:x})$0", 1081 insert: "quux(${1:x})$0",
1082 kind: Function, 1082 kind: Function,
1083 lookup: "quux", 1083 lookup: "quux",
@@ -1086,16 +1086,16 @@ mod tests {
1086 }, 1086 },
1087 CompletionItem { 1087 CompletionItem {
1088 label: "x", 1088 label: "x",
1089 source_range: [145; 146), 1089 source_range: 145..146,
1090 delete: [145; 146), 1090 delete: 145..146,
1091 insert: "x", 1091 insert: "x",
1092 kind: Binding, 1092 kind: Binding,
1093 detail: "i32", 1093 detail: "i32",
1094 }, 1094 },
1095 CompletionItem { 1095 CompletionItem {
1096 label: "y", 1096 label: "y",
1097 source_range: [145; 146), 1097 source_range: 145..146,
1098 delete: [145; 146), 1098 delete: 145..146,
1099 insert: "y", 1099 insert: "y",
1100 kind: Binding, 1100 kind: Binding,
1101 detail: "i32", 1101 detail: "i32",
@@ -1121,14 +1121,14 @@ mod tests {
1121 [ 1121 [
1122 CompletionItem { 1122 CompletionItem {
1123 label: "Quux", 1123 label: "Quux",
1124 source_range: [82; 82), 1124 source_range: 82..82,
1125 delete: [82; 82), 1125 delete: 82..82,
1126 insert: "Quux", 1126 insert: "Quux",
1127 }, 1127 },
1128 CompletionItem { 1128 CompletionItem {
1129 label: "main()", 1129 label: "main()",
1130 source_range: [82; 82), 1130 source_range: 82..82,
1131 delete: [82; 82), 1131 delete: 82..82,
1132 insert: "main()$0", 1132 insert: "main()$0",
1133 kind: Function, 1133 kind: Function,
1134 lookup: "main", 1134 lookup: "main",
@@ -1162,31 +1162,31 @@ mod tests {
1162 [ 1162 [
1163 CompletionItem { 1163 CompletionItem {
1164 label: "Foo", 1164 label: "Foo",
1165 source_range: [248; 250), 1165 source_range: 248..250,
1166 delete: [248; 250), 1166 delete: 248..250,
1167 insert: "Foo", 1167 insert: "Foo",
1168 kind: Enum, 1168 kind: Enum,
1169 }, 1169 },
1170 CompletionItem { 1170 CompletionItem {
1171 label: "Foo::Bar", 1171 label: "Foo::Bar",
1172 source_range: [248; 250), 1172 source_range: 248..250,
1173 delete: [248; 250), 1173 delete: 248..250,
1174 insert: "Foo::Bar", 1174 insert: "Foo::Bar",
1175 kind: EnumVariant, 1175 kind: EnumVariant,
1176 detail: "()", 1176 detail: "()",
1177 }, 1177 },
1178 CompletionItem { 1178 CompletionItem {
1179 label: "Foo::Baz", 1179 label: "Foo::Baz",
1180 source_range: [248; 250), 1180 source_range: 248..250,
1181 delete: [248; 250), 1181 delete: 248..250,
1182 insert: "Foo::Baz", 1182 insert: "Foo::Baz",
1183 kind: EnumVariant, 1183 kind: EnumVariant,
1184 detail: "()", 1184 detail: "()",
1185 }, 1185 },
1186 CompletionItem { 1186 CompletionItem {
1187 label: "Foo::Quux", 1187 label: "Foo::Quux",
1188 source_range: [248; 250), 1188 source_range: 248..250,
1189 delete: [248; 250), 1189 delete: 248..250,
1190 insert: "Foo::Quux", 1190 insert: "Foo::Quux",
1191 kind: EnumVariant, 1191 kind: EnumVariant,
1192 detail: "()", 1192 detail: "()",
@@ -1220,31 +1220,31 @@ mod tests {
1220 [ 1220 [
1221 CompletionItem { 1221 CompletionItem {
1222 label: "Foo", 1222 label: "Foo",
1223 source_range: [219; 221), 1223 source_range: 219..221,
1224 delete: [219; 221), 1224 delete: 219..221,
1225 insert: "Foo", 1225 insert: "Foo",
1226 kind: Enum, 1226 kind: Enum,
1227 }, 1227 },
1228 CompletionItem { 1228 CompletionItem {
1229 label: "Foo::Bar", 1229 label: "Foo::Bar",
1230 source_range: [219; 221), 1230 source_range: 219..221,
1231 delete: [219; 221), 1231 delete: 219..221,
1232 insert: "Foo::Bar", 1232 insert: "Foo::Bar",
1233 kind: EnumVariant, 1233 kind: EnumVariant,
1234 detail: "()", 1234 detail: "()",
1235 }, 1235 },
1236 CompletionItem { 1236 CompletionItem {
1237 label: "Foo::Baz", 1237 label: "Foo::Baz",
1238 source_range: [219; 221), 1238 source_range: 219..221,
1239 delete: [219; 221), 1239 delete: 219..221,
1240 insert: "Foo::Baz", 1240 insert: "Foo::Baz",
1241 kind: EnumVariant, 1241 kind: EnumVariant,
1242 detail: "()", 1242 detail: "()",
1243 }, 1243 },
1244 CompletionItem { 1244 CompletionItem {
1245 label: "Foo::Quux", 1245 label: "Foo::Quux",
1246 source_range: [219; 221), 1246 source_range: 219..221,
1247 delete: [219; 221), 1247 delete: 219..221,
1248 insert: "Foo::Quux", 1248 insert: "Foo::Quux",
1249 kind: EnumVariant, 1249 kind: EnumVariant,
1250 detail: "()", 1250 detail: "()",
@@ -1274,39 +1274,39 @@ mod tests {
1274 [ 1274 [
1275 CompletionItem { 1275 CompletionItem {
1276 label: "Foo", 1276 label: "Foo",
1277 source_range: [185; 186), 1277 source_range: 185..186,
1278 delete: [185; 186), 1278 delete: 185..186,
1279 insert: "Foo", 1279 insert: "Foo",
1280 kind: Enum, 1280 kind: Enum,
1281 }, 1281 },
1282 CompletionItem { 1282 CompletionItem {
1283 label: "Foo::Bar", 1283 label: "Foo::Bar",
1284 source_range: [185; 186), 1284 source_range: 185..186,
1285 delete: [185; 186), 1285 delete: 185..186,
1286 insert: "Foo::Bar", 1286 insert: "Foo::Bar",
1287 kind: EnumVariant, 1287 kind: EnumVariant,
1288 detail: "()", 1288 detail: "()",
1289 }, 1289 },
1290 CompletionItem { 1290 CompletionItem {
1291 label: "Foo::Baz", 1291 label: "Foo::Baz",
1292 source_range: [185; 186), 1292 source_range: 185..186,
1293 delete: [185; 186), 1293 delete: 185..186,
1294 insert: "Foo::Baz", 1294 insert: "Foo::Baz",
1295 kind: EnumVariant, 1295 kind: EnumVariant,
1296 detail: "()", 1296 detail: "()",
1297 }, 1297 },
1298 CompletionItem { 1298 CompletionItem {
1299 label: "Foo::Quux", 1299 label: "Foo::Quux",
1300 source_range: [185; 186), 1300 source_range: 185..186,
1301 delete: [185; 186), 1301 delete: 185..186,
1302 insert: "Foo::Quux", 1302 insert: "Foo::Quux",
1303 kind: EnumVariant, 1303 kind: EnumVariant,
1304 detail: "()", 1304 detail: "()",
1305 }, 1305 },
1306 CompletionItem { 1306 CompletionItem {
1307 label: "main()", 1307 label: "main()",
1308 source_range: [185; 186), 1308 source_range: 185..186,
1309 delete: [185; 186), 1309 delete: 185..186,
1310 insert: "main()$0", 1310 insert: "main()$0",
1311 kind: Function, 1311 kind: Function,
1312 lookup: "main", 1312 lookup: "main",
@@ -1333,8 +1333,8 @@ mod tests {
1333 [ 1333 [
1334 CompletionItem { 1334 CompletionItem {
1335 label: "f()", 1335 label: "f()",
1336 source_range: [98; 99), 1336 source_range: 98..99,
1337 delete: [98; 99), 1337 delete: 98..99,
1338 insert: "f()$0", 1338 insert: "f()$0",
1339 kind: Function, 1339 kind: Function,
1340 lookup: "f", 1340 lookup: "f",
@@ -1342,15 +1342,15 @@ mod tests {
1342 }, 1342 },
1343 CompletionItem { 1343 CompletionItem {
1344 label: "m", 1344 label: "m",
1345 source_range: [98; 99), 1345 source_range: 98..99,
1346 delete: [98; 99), 1346 delete: 98..99,
1347 insert: "m", 1347 insert: "m",
1348 kind: Module, 1348 kind: Module,
1349 }, 1349 },
1350 CompletionItem { 1350 CompletionItem {
1351 label: "m::E::V", 1351 label: "m::E::V",
1352 source_range: [98; 99), 1352 source_range: 98..99,
1353 delete: [98; 99), 1353 delete: 98..99,
1354 insert: "m::E::V", 1354 insert: "m::E::V",
1355 kind: EnumVariant, 1355 kind: EnumVariant,
1356 detail: "()", 1356 detail: "()",
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 37880448a..5f2797e41 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -7,7 +7,7 @@ use ra_syntax::{
7 algo::{find_covering_element, find_node_at_offset}, 7 algo::{find_covering_element, find_node_at_offset},
8 ast, AstNode, 8 ast, AstNode,
9 SyntaxKind::*, 9 SyntaxKind::*,
10 SyntaxNode, SyntaxToken, TextRange, TextUnit, 10 SyntaxNode, SyntaxToken, TextRange, TextSize,
11}; 11};
12use ra_text_edit::AtomTextEdit; 12use ra_text_edit::AtomTextEdit;
13 13
@@ -20,7 +20,7 @@ pub(crate) struct CompletionContext<'a> {
20 pub(super) sema: Semantics<'a, RootDatabase>, 20 pub(super) sema: Semantics<'a, RootDatabase>,
21 pub(super) db: &'a RootDatabase, 21 pub(super) db: &'a RootDatabase,
22 pub(super) config: &'a CompletionConfig, 22 pub(super) config: &'a CompletionConfig,
23 pub(super) offset: TextUnit, 23 pub(super) offset: TextSize,
24 /// The token before the cursor, in the original file. 24 /// The token before the cursor, in the original file.
25 pub(super) original_token: SyntaxToken, 25 pub(super) original_token: SyntaxToken,
26 /// The token before the cursor, in the macro-expanded file. 26 /// The token before the cursor, in the macro-expanded file.
@@ -167,7 +167,7 @@ impl<'a> CompletionContext<'a> {
167 match self.token.kind() { 167 match self.token.kind() {
168 // workaroud when completion is triggered by trigger characters. 168 // workaroud when completion is triggered by trigger characters.
169 IDENT => self.original_token.text_range(), 169 IDENT => self.original_token.text_range(),
170 _ => TextRange::offset_len(self.offset, 0.into()), 170 _ => TextRange::empty(self.offset),
171 } 171 }
172 } 172 }
173 173
@@ -190,7 +190,7 @@ impl<'a> CompletionContext<'a> {
190 &mut self, 190 &mut self,
191 original_file: &SyntaxNode, 191 original_file: &SyntaxNode,
192 file_with_fake_ident: SyntaxNode, 192 file_with_fake_ident: SyntaxNode,
193 offset: TextUnit, 193 offset: TextSize,
194 ) { 194 ) {
195 // First, let's try to complete a reference to some declaration. 195 // First, let's try to complete a reference to some declaration.
196 if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&file_with_fake_ident, offset) { 196 if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&file_with_fake_ident, offset) {
@@ -224,7 +224,8 @@ impl<'a> CompletionContext<'a> {
224 } 224 }
225 if let Some(let_stmt) = bind_pat.syntax().ancestors().find_map(ast::LetStmt::cast) { 225 if let Some(let_stmt) = bind_pat.syntax().ancestors().find_map(ast::LetStmt::cast) {
226 if let Some(pat) = let_stmt.pat() { 226 if let Some(pat) = let_stmt.pat() {
227 if bind_pat.syntax().text_range().is_subrange(&pat.syntax().text_range()) { 227 if pat.syntax().text_range().contains_range(bind_pat.syntax().text_range())
228 {
228 self.is_pat_binding_or_const = false; 229 self.is_pat_binding_or_const = false;
229 } 230 }
230 } 231 }
@@ -246,7 +247,7 @@ impl<'a> CompletionContext<'a> {
246 &mut self, 247 &mut self,
247 original_file: &SyntaxNode, 248 original_file: &SyntaxNode,
248 name_ref: ast::NameRef, 249 name_ref: ast::NameRef,
249 offset: TextUnit, 250 offset: TextSize,
250 ) { 251 ) {
251 self.name_ref_syntax = 252 self.name_ref_syntax =
252 find_node_at_offset(&original_file, name_ref.syntax().text_range().start()); 253 find_node_at_offset(&original_file, name_ref.syntax().text_range().start());
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 6a6ddc7bd..7633cd7fd 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -15,12 +15,7 @@ use crate::{
15}; 15};
16 16
17impl Completions { 17impl Completions {
18 pub(crate) fn add_field( 18 pub(crate) fn add_field(&mut self, ctx: &CompletionContext, field: hir::Field, ty: &Type) {
19 &mut self,
20 ctx: &CompletionContext,
21 field: hir::StructField,
22 ty: &Type,
23 ) {
24 let is_deprecated = is_deprecated(field, ctx.db); 19 let is_deprecated = is_deprecated(field, ctx.db);
25 let ty = ty.display(ctx.db).to_string(); 20 let ty = ty.display(ctx.db).to_string();
26 let name = field.name(ctx.db); 21 let name = field.name(ctx.db);
@@ -452,8 +447,8 @@ mod tests {
452 [ 447 [
453 CompletionItem { 448 CompletionItem {
454 label: "Foo", 449 label: "Foo",
455 source_range: [121; 123), 450 source_range: 121..123,
456 delete: [121; 123), 451 delete: 121..123,
457 insert: "Foo", 452 insert: "Foo",
458 kind: EnumVariant, 453 kind: EnumVariant,
459 detail: "{ x: i32, y: i32 }", 454 detail: "{ x: i32, y: i32 }",
@@ -478,8 +473,8 @@ mod tests {
478 [ 473 [
479 CompletionItem { 474 CompletionItem {
480 label: "Foo(…)", 475 label: "Foo(…)",
481 source_range: [115; 117), 476 source_range: 115..117,
482 delete: [115; 117), 477 delete: 115..117,
483 insert: "Foo($0)", 478 insert: "Foo($0)",
484 kind: EnumVariant, 479 kind: EnumVariant,
485 lookup: "Foo", 480 lookup: "Foo",
@@ -506,8 +501,8 @@ mod tests {
506 [ 501 [
507 CompletionItem { 502 CompletionItem {
508 label: "Foo", 503 label: "Foo",
509 source_range: [104; 106), 504 source_range: 104..106,
510 delete: [104; 106), 505 delete: 104..106,
511 insert: "Foo", 506 insert: "Foo",
512 kind: EnumVariant, 507 kind: EnumVariant,
513 detail: "()", 508 detail: "()",
@@ -534,8 +529,8 @@ mod tests {
534 [ 529 [
535 CompletionItem { 530 CompletionItem {
536 label: "main()", 531 label: "main()",
537 source_range: [203; 206), 532 source_range: 203..206,
538 delete: [203; 206), 533 delete: 203..206,
539 insert: "main()$0", 534 insert: "main()$0",
540 kind: Function, 535 kind: Function,
541 lookup: "main", 536 lookup: "main",
@@ -543,8 +538,8 @@ mod tests {
543 }, 538 },
544 CompletionItem { 539 CompletionItem {
545 label: "something_deprecated()", 540 label: "something_deprecated()",
546 source_range: [203; 206), 541 source_range: 203..206,
547 delete: [203; 206), 542 delete: 203..206,
548 insert: "something_deprecated()$0", 543 insert: "something_deprecated()$0",
549 kind: Function, 544 kind: Function,
550 lookup: "something_deprecated", 545 lookup: "something_deprecated",
@@ -553,8 +548,8 @@ mod tests {
553 }, 548 },
554 CompletionItem { 549 CompletionItem {
555 label: "something_else_deprecated()", 550 label: "something_else_deprecated()",
556 source_range: [203; 206), 551 source_range: 203..206,
557 delete: [203; 206), 552 delete: 203..206,
558 insert: "something_else_deprecated()$0", 553 insert: "something_else_deprecated()$0",
559 kind: Function, 554 kind: Function,
560 lookup: "something_else_deprecated", 555 lookup: "something_else_deprecated",
@@ -580,8 +575,8 @@ mod tests {
580 [ 575 [
581 CompletionItem { 576 CompletionItem {
582 label: "main()", 577 label: "main()",
583 source_range: [61; 64), 578 source_range: 61..64,
584 delete: [61; 64), 579 delete: 61..64,
585 insert: "main()$0", 580 insert: "main()$0",
586 kind: Function, 581 kind: Function,
587 lookup: "main", 582 lookup: "main",
@@ -589,8 +584,8 @@ mod tests {
589 }, 584 },
590 CompletionItem { 585 CompletionItem {
591 label: "no_args()", 586 label: "no_args()",
592 source_range: [61; 64), 587 source_range: 61..64,
593 delete: [61; 64), 588 delete: 61..64,
594 insert: "no_args()$0", 589 insert: "no_args()$0",
595 kind: Function, 590 kind: Function,
596 lookup: "no_args", 591 lookup: "no_args",
@@ -610,8 +605,8 @@ mod tests {
610 [ 605 [
611 CompletionItem { 606 CompletionItem {
612 label: "main()", 607 label: "main()",
613 source_range: [80; 85), 608 source_range: 80..85,
614 delete: [80; 85), 609 delete: 80..85,
615 insert: "main()$0", 610 insert: "main()$0",
616 kind: Function, 611 kind: Function,
617 lookup: "main", 612 lookup: "main",
@@ -619,8 +614,8 @@ mod tests {
619 }, 614 },
620 CompletionItem { 615 CompletionItem {
621 label: "with_args(…)", 616 label: "with_args(…)",
622 source_range: [80; 85), 617 source_range: 80..85,
623 delete: [80; 85), 618 delete: 80..85,
624 insert: "with_args(${1:x}, ${2:y})$0", 619 insert: "with_args(${1:x}, ${2:y})$0",
625 kind: Function, 620 kind: Function,
626 lookup: "with_args", 621 lookup: "with_args",
@@ -646,8 +641,8 @@ mod tests {
646 [ 641 [
647 CompletionItem { 642 CompletionItem {
648 label: "foo()", 643 label: "foo()",
649 source_range: [163; 164), 644 source_range: 163..164,
650 delete: [163; 164), 645 delete: 163..164,
651 insert: "foo()$0", 646 insert: "foo()$0",
652 kind: Method, 647 kind: Method,
653 lookup: "foo", 648 lookup: "foo",
@@ -674,23 +669,23 @@ mod tests {
674 [ 669 [
675 CompletionItem { 670 CompletionItem {
676 label: "None", 671 label: "None",
677 source_range: [144; 147), 672 source_range: 144..147,
678 delete: [144; 147), 673 delete: 144..147,
679 insert: "None", 674 insert: "None",
680 kind: EnumVariant, 675 kind: EnumVariant,
681 detail: "()", 676 detail: "()",
682 }, 677 },
683 CompletionItem { 678 CompletionItem {
684 label: "Option", 679 label: "Option",
685 source_range: [144; 147), 680 source_range: 144..147,
686 delete: [144; 147), 681 delete: 144..147,
687 insert: "Option", 682 insert: "Option",
688 kind: Enum, 683 kind: Enum,
689 }, 684 },
690 CompletionItem { 685 CompletionItem {
691 label: "Some(…)", 686 label: "Some(…)",
692 source_range: [144; 147), 687 source_range: 144..147,
693 delete: [144; 147), 688 delete: 144..147,
694 insert: "Some($0)", 689 insert: "Some($0)",
695 kind: EnumVariant, 690 kind: EnumVariant,
696 lookup: "Some", 691 lookup: "Some",
@@ -699,8 +694,8 @@ mod tests {
699 }, 694 },
700 CompletionItem { 695 CompletionItem {
701 label: "main()", 696 label: "main()",
702 source_range: [144; 147), 697 source_range: 144..147,
703 delete: [144; 147), 698 delete: 144..147,
704 insert: "main()$0", 699 insert: "main()$0",
705 kind: Function, 700 kind: Function,
706 lookup: "main", 701 lookup: "main",
@@ -725,23 +720,23 @@ mod tests {
725 [ 720 [
726 CompletionItem { 721 CompletionItem {
727 label: "None", 722 label: "None",
728 source_range: [185; 188), 723 source_range: 185..188,
729 delete: [185; 188), 724 delete: 185..188,
730 insert: "None", 725 insert: "None",
731 kind: EnumVariant, 726 kind: EnumVariant,
732 detail: "()", 727 detail: "()",
733 }, 728 },
734 CompletionItem { 729 CompletionItem {
735 label: "Option", 730 label: "Option",
736 source_range: [185; 188), 731 source_range: 185..188,
737 delete: [185; 188), 732 delete: 185..188,
738 insert: "Option", 733 insert: "Option",
739 kind: Enum, 734 kind: Enum,
740 }, 735 },
741 CompletionItem { 736 CompletionItem {
742 label: "Some(…)", 737 label: "Some(…)",
743 source_range: [185; 188), 738 source_range: 185..188,
744 delete: [185; 188), 739 delete: 185..188,
745 insert: "Some($0)", 740 insert: "Some($0)",
746 kind: EnumVariant, 741 kind: EnumVariant,
747 lookup: "Some", 742 lookup: "Some",
@@ -771,8 +766,8 @@ mod tests {
771 [ 766 [
772 CompletionItem { 767 CompletionItem {
773 label: "foo(…)", 768 label: "foo(…)",
774 source_range: [171; 172), 769 source_range: 171..172,
775 delete: [171; 172), 770 delete: 171..172,
776 insert: "foo(${1:x})$0", 771 insert: "foo(${1:x})$0",
777 kind: Method, 772 kind: Method,
778 lookup: "foo", 773 lookup: "foo",
@@ -806,8 +801,8 @@ mod tests {
806 [ 801 [
807 CompletionItem { 802 CompletionItem {
808 label: "foo(…)", 803 label: "foo(…)",
809 source_range: [171; 172), 804 source_range: 171..172,
810 delete: [171; 172), 805 delete: 171..172,
811 insert: "foo($0)", 806 insert: "foo($0)",
812 kind: Method, 807 kind: Method,
813 lookup: "foo", 808 lookup: "foo",
@@ -833,8 +828,8 @@ mod tests {
833 [ 828 [
834 CompletionItem { 829 CompletionItem {
835 label: "foo", 830 label: "foo",
836 source_range: [40; 41), 831 source_range: 40..41,
837 delete: [40; 41), 832 delete: 40..41,
838 insert: "foo", 833 insert: "foo",
839 kind: Function, 834 kind: Function,
840 detail: "pub fn foo()", 835 detail: "pub fn foo()",
@@ -860,16 +855,16 @@ mod tests {
860 [ 855 [
861 CompletionItem { 856 CompletionItem {
862 label: "frobnicate", 857 label: "frobnicate",
863 source_range: [35; 39), 858 source_range: 35..39,
864 delete: [35; 39), 859 delete: 35..39,
865 insert: "frobnicate", 860 insert: "frobnicate",
866 kind: Function, 861 kind: Function,
867 detail: "fn frobnicate()", 862 detail: "fn frobnicate()",
868 }, 863 },
869 CompletionItem { 864 CompletionItem {
870 label: "main", 865 label: "main",
871 source_range: [35; 39), 866 source_range: 35..39,
872 delete: [35; 39), 867 delete: 35..39,
873 insert: "main", 868 insert: "main",
874 kind: Function, 869 kind: Function,
875 detail: "fn main()", 870 detail: "fn main()",
@@ -892,8 +887,8 @@ mod tests {
892 [ 887 [
893 CompletionItem { 888 CompletionItem {
894 label: "new", 889 label: "new",
895 source_range: [67; 69), 890 source_range: 67..69,
896 delete: [67; 69), 891 delete: 67..69,
897 insert: "new", 892 insert: "new",
898 kind: Function, 893 kind: Function,
899 detail: "fn new() -> Foo", 894 detail: "fn new() -> Foo",
@@ -917,16 +912,16 @@ mod tests {
917 [ 912 [
918 CompletionItem { 913 CompletionItem {
919 label: "Vec<…>", 914 label: "Vec<…>",
920 source_range: [61; 63), 915 source_range: 61..63,
921 delete: [61; 63), 916 delete: 61..63,
922 insert: "Vec<$0>", 917 insert: "Vec<$0>",
923 kind: Struct, 918 kind: Struct,
924 lookup: "Vec", 919 lookup: "Vec",
925 }, 920 },
926 CompletionItem { 921 CompletionItem {
927 label: "foo(…)", 922 label: "foo(…)",
928 source_range: [61; 63), 923 source_range: 61..63,
929 delete: [61; 63), 924 delete: 61..63,
930 insert: "foo(${1:xs})$0", 925 insert: "foo(${1:xs})$0",
931 kind: Function, 926 kind: Function,
932 lookup: "foo", 927 lookup: "foo",
@@ -947,16 +942,16 @@ mod tests {
947 [ 942 [
948 CompletionItem { 943 CompletionItem {
949 label: "Vec<…>", 944 label: "Vec<…>",
950 source_range: [64; 66), 945 source_range: 64..66,
951 delete: [64; 66), 946 delete: 64..66,
952 insert: "Vec<$0>", 947 insert: "Vec<$0>",
953 kind: TypeAlias, 948 kind: TypeAlias,
954 lookup: "Vec", 949 lookup: "Vec",
955 }, 950 },
956 CompletionItem { 951 CompletionItem {
957 label: "foo(…)", 952 label: "foo(…)",
958 source_range: [64; 66), 953 source_range: 64..66,
959 delete: [64; 66), 954 delete: 64..66,
960 insert: "foo(${1:xs})$0", 955 insert: "foo(${1:xs})$0",
961 kind: Function, 956 kind: Function,
962 lookup: "foo", 957 lookup: "foo",
@@ -977,15 +972,15 @@ mod tests {
977 [ 972 [
978 CompletionItem { 973 CompletionItem {
979 label: "Vec", 974 label: "Vec",
980 source_range: [68; 70), 975 source_range: 68..70,
981 delete: [68; 70), 976 delete: 68..70,
982 insert: "Vec", 977 insert: "Vec",
983 kind: Struct, 978 kind: Struct,
984 }, 979 },
985 CompletionItem { 980 CompletionItem {
986 label: "foo(…)", 981 label: "foo(…)",
987 source_range: [68; 70), 982 source_range: 68..70,
988 delete: [68; 70), 983 delete: 68..70,
989 insert: "foo(${1:xs})$0", 984 insert: "foo(${1:xs})$0",
990 kind: Function, 985 kind: Function,
991 lookup: "foo", 986 lookup: "foo",
@@ -1006,15 +1001,15 @@ mod tests {
1006 [ 1001 [
1007 CompletionItem { 1002 CompletionItem {
1008 label: "Vec", 1003 label: "Vec",
1009 source_range: [61; 63), 1004 source_range: 61..63,
1010 delete: [61; 63), 1005 delete: 61..63,
1011 insert: "Vec", 1006 insert: "Vec",
1012 kind: Struct, 1007 kind: Struct,
1013 }, 1008 },
1014 CompletionItem { 1009 CompletionItem {
1015 label: "foo(…)", 1010 label: "foo(…)",
1016 source_range: [61; 63), 1011 source_range: 61..63,
1017 delete: [61; 63), 1012 delete: 61..63,
1018 insert: "foo(${1:xs})$0", 1013 insert: "foo(${1:xs})$0",
1019 kind: Function, 1014 kind: Function,
1020 lookup: "foo", 1015 lookup: "foo",
@@ -1046,8 +1041,8 @@ mod tests {
1046 [ 1041 [
1047 CompletionItem { 1042 CompletionItem {
1048 label: "frobnicate!", 1043 label: "frobnicate!",
1049 source_range: [9; 9), 1044 source_range: 9..9,
1050 delete: [9; 9), 1045 delete: 9..9,
1051 insert: "frobnicate", 1046 insert: "frobnicate",
1052 kind: Macro, 1047 kind: Macro,
1053 detail: "#[macro_export]\nmacro_rules! frobnicate", 1048 detail: "#[macro_export]\nmacro_rules! frobnicate",
@@ -1072,16 +1067,16 @@ mod tests {
1072 [ 1067 [
1073 CompletionItem { 1068 CompletionItem {
1074 label: "frobnicate!", 1069 label: "frobnicate!",
1075 source_range: [56; 60), 1070 source_range: 56..60,
1076 delete: [56; 60), 1071 delete: 56..60,
1077 insert: "frobnicate", 1072 insert: "frobnicate",
1078 kind: Macro, 1073 kind: Macro,
1079 detail: "macro_rules! frobnicate", 1074 detail: "macro_rules! frobnicate",
1080 }, 1075 },
1081 CompletionItem { 1076 CompletionItem {
1082 label: "main()", 1077 label: "main()",
1083 source_range: [56; 60), 1078 source_range: 56..60,
1084 delete: [56; 60), 1079 delete: 56..60,
1085 insert: "main()$0", 1080 insert: "main()$0",
1086 kind: Function, 1081 kind: Function,
1087 lookup: "main", 1082 lookup: "main",
@@ -1109,24 +1104,24 @@ mod tests {
1109 [ 1104 [
1110 CompletionItem { 1105 CompletionItem {
1111 label: "another_field", 1106 label: "another_field",
1112 source_range: [201; 201), 1107 source_range: 201..201,
1113 delete: [201; 201), 1108 delete: 201..201,
1114 insert: "another_field", 1109 insert: "another_field",
1115 kind: Field, 1110 kind: Field,
1116 detail: "i64", 1111 detail: "i64",
1117 }, 1112 },
1118 CompletionItem { 1113 CompletionItem {
1119 label: "my_string", 1114 label: "my_string",
1120 source_range: [201; 201), 1115 source_range: 201..201,
1121 delete: [201; 201), 1116 delete: 201..201,
1122 insert: "my_string", 1117 insert: "my_string",
1123 kind: Field, 1118 kind: Field,
1124 detail: "{unknown}", 1119 detail: "{unknown}",
1125 }, 1120 },
1126 CompletionItem { 1121 CompletionItem {
1127 label: "the_field", 1122 label: "the_field",
1128 source_range: [201; 201), 1123 source_range: 201..201,
1129 delete: [201; 201), 1124 delete: 201..201,
1130 insert: "the_field", 1125 insert: "the_field",
1131 kind: Field, 1126 kind: Field,
1132 detail: "u32", 1127 detail: "u32",
@@ -1153,16 +1148,16 @@ mod tests {
1153 [ 1148 [
1154 CompletionItem { 1149 CompletionItem {
1155 label: "another_field", 1150 label: "another_field",
1156 source_range: [208; 208), 1151 source_range: 208..208,
1157 delete: [208; 208), 1152 delete: 208..208,
1158 insert: "another_field", 1153 insert: "another_field",
1159 kind: Field, 1154 kind: Field,
1160 detail: "i64", 1155 detail: "i64",
1161 }, 1156 },
1162 CompletionItem { 1157 CompletionItem {
1163 label: "another_good_type", 1158 label: "another_good_type",
1164 source_range: [208; 208), 1159 source_range: 208..208,
1165 delete: [208; 208), 1160 delete: 208..208,
1166 insert: "another_good_type", 1161 insert: "another_good_type",
1167 kind: Field, 1162 kind: Field,
1168 detail: "u32", 1163 detail: "u32",
@@ -1170,8 +1165,8 @@ mod tests {
1170 }, 1165 },
1171 CompletionItem { 1166 CompletionItem {
1172 label: "the_field", 1167 label: "the_field",
1173 source_range: [208; 208), 1168 source_range: 208..208,
1174 delete: [208; 208), 1169 delete: 208..208,
1175 insert: "the_field", 1170 insert: "the_field",
1176 kind: Field, 1171 kind: Field,
1177 detail: "u32", 1172 detail: "u32",
@@ -1201,16 +1196,16 @@ mod tests {
1201 [ 1196 [
1202 CompletionItem { 1197 CompletionItem {
1203 label: "another_field", 1198 label: "another_field",
1204 source_range: [270; 270), 1199 source_range: 270..270,
1205 delete: [270; 270), 1200 delete: 270..270,
1206 insert: "another_field", 1201 insert: "another_field",
1207 kind: Field, 1202 kind: Field,
1208 detail: "i64", 1203 detail: "i64",
1209 }, 1204 },
1210 CompletionItem { 1205 CompletionItem {
1211 label: "another_good_type", 1206 label: "another_good_type",
1212 source_range: [270; 270), 1207 source_range: 270..270,
1213 delete: [270; 270), 1208 delete: 270..270,
1214 insert: "another_good_type", 1209 insert: "another_good_type",
1215 kind: Field, 1210 kind: Field,
1216 detail: "u32", 1211 detail: "u32",
@@ -1218,8 +1213,8 @@ mod tests {
1218 }, 1213 },
1219 CompletionItem { 1214 CompletionItem {
1220 label: "the_field", 1215 label: "the_field",
1221 source_range: [270; 270), 1216 source_range: 270..270,
1222 delete: [270; 270), 1217 delete: 270..270,
1223 insert: "the_field", 1218 insert: "the_field",
1224 kind: Field, 1219 kind: Field,
1225 detail: "u32", 1220 detail: "u32",
@@ -1249,8 +1244,8 @@ mod tests {
1249 [ 1244 [
1250 CompletionItem { 1245 CompletionItem {
1251 label: "another_field", 1246 label: "another_field",
1252 source_range: [336; 336), 1247 source_range: 336..336,
1253 delete: [336; 336), 1248 delete: 336..336,
1254 insert: "another_field", 1249 insert: "another_field",
1255 kind: Field, 1250 kind: Field,
1256 detail: "i64", 1251 detail: "i64",
@@ -1258,16 +1253,16 @@ mod tests {
1258 }, 1253 },
1259 CompletionItem { 1254 CompletionItem {
1260 label: "another_good_type", 1255 label: "another_good_type",
1261 source_range: [336; 336), 1256 source_range: 336..336,
1262 delete: [336; 336), 1257 delete: 336..336,
1263 insert: "another_good_type", 1258 insert: "another_good_type",
1264 kind: Field, 1259 kind: Field,
1265 detail: "u32", 1260 detail: "u32",
1266 }, 1261 },
1267 CompletionItem { 1262 CompletionItem {
1268 label: "the_field", 1263 label: "the_field",
1269 source_range: [336; 336), 1264 source_range: 336..336,
1270 delete: [336; 336), 1265 delete: 336..336,
1271 insert: "the_field", 1266 insert: "the_field",
1272 kind: Field, 1267 kind: Field,
1273 detail: "u32", 1268 detail: "u32",
@@ -1296,16 +1291,16 @@ mod tests {
1296 [ 1291 [
1297 CompletionItem { 1292 CompletionItem {
1298 label: "another_field", 1293 label: "another_field",
1299 source_range: [328; 328), 1294 source_range: 328..328,
1300 delete: [328; 328), 1295 delete: 328..328,
1301 insert: "another_field", 1296 insert: "another_field",
1302 kind: Field, 1297 kind: Field,
1303 detail: "i64", 1298 detail: "i64",
1304 }, 1299 },
1305 CompletionItem { 1300 CompletionItem {
1306 label: "another_good_type", 1301 label: "another_good_type",
1307 source_range: [328; 328), 1302 source_range: 328..328,
1308 delete: [328; 328), 1303 delete: 328..328,
1309 insert: "another_good_type", 1304 insert: "another_good_type",
1310 kind: Field, 1305 kind: Field,
1311 detail: "u32", 1306 detail: "u32",
@@ -1313,8 +1308,8 @@ mod tests {
1313 }, 1308 },
1314 CompletionItem { 1309 CompletionItem {
1315 label: "the_field", 1310 label: "the_field",
1316 source_range: [328; 328), 1311 source_range: 328..328,
1317 delete: [328; 328), 1312 delete: 328..328,
1318 insert: "the_field", 1313 insert: "the_field",
1319 kind: Field, 1314 kind: Field,
1320 detail: "u32", 1315 detail: "u32",
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index e7e201709..a6b4c2c28 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -171,7 +171,7 @@ fn text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(
171 if single_use_tree.path()?.segment()?.syntax().first_child_or_token()?.kind() == T![self] { 171 if single_use_tree.path()?.segment()?.syntax().first_child_or_token()?.kind() == T![self] {
172 let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start(); 172 let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start();
173 let end = use_tree_list_node.text_range().end(); 173 let end = use_tree_list_node.text_range().end();
174 let range = TextRange::from_to(start, end); 174 let range = TextRange::new(start, end);
175 return Some(TextEdit::delete(range)); 175 return Some(TextEdit::delete(range));
176 } 176 }
177 None 177 None
@@ -277,7 +277,7 @@ mod tests {
277 assert!( 277 assert!(
278 diagnostic.range.start() <= file_position.offset 278 diagnostic.range.start() <= file_position.offset
279 && diagnostic.range.end() >= file_position.offset, 279 && diagnostic.range.end() >= file_position.offset,
280 "diagnostic range {} does not touch cursor position {}", 280 "diagnostic range {:?} does not touch cursor position {:?}",
281 diagnostic.range, 281 diagnostic.range,
282 file_position.offset 282 file_position.offset
283 ); 283 );
@@ -603,7 +603,7 @@ mod tests {
603 [ 603 [
604 Diagnostic { 604 Diagnostic {
605 message: "unresolved module", 605 message: "unresolved module",
606 range: [0; 8), 606 range: 0..8,
607 fix: Some( 607 fix: Some(
608 SourceChange { 608 SourceChange {
609 label: "create module", 609 label: "create module",
@@ -652,7 +652,7 @@ mod tests {
652 [ 652 [
653 Diagnostic { 653 Diagnostic {
654 message: "Missing structure fields:\n- b", 654 message: "Missing structure fields:\n- b",
655 range: [224; 233), 655 range: 224..233,
656 fix: Some( 656 fix: Some(
657 SourceChange { 657 SourceChange {
658 label: "fill struct fields", 658 label: "fill struct fields",
@@ -664,7 +664,7 @@ mod tests {
664 edit: TextEdit { 664 edit: TextEdit {
665 atoms: [ 665 atoms: [
666 AtomTextEdit { 666 AtomTextEdit {
667 delete: [3; 9), 667 delete: 3..9,
668 insert: "{a:42, b: ()}", 668 insert: "{a:42, b: ()}",
669 }, 669 },
670 ], 670 ],
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 67bc9c31b..914a8b471 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -189,7 +189,7 @@ impl TryToNav for Definition {
189 fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { 189 fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
190 match self { 190 match self {
191 Definition::Macro(it) => Some(it.to_nav(db)), 191 Definition::Macro(it) => Some(it.to_nav(db)),
192 Definition::StructField(it) => Some(it.to_nav(db)), 192 Definition::Field(it) => Some(it.to_nav(db)),
193 Definition::ModuleDef(it) => it.try_to_nav(db), 193 Definition::ModuleDef(it) => it.try_to_nav(db),
194 Definition::SelfType(it) => Some(it.to_nav(db)), 194 Definition::SelfType(it) => Some(it.to_nav(db)),
195 Definition::Local(it) => Some(it.to_nav(db)), 195 Definition::Local(it) => Some(it.to_nav(db)),
@@ -286,7 +286,7 @@ impl ToNav for hir::ImplDef {
286 } 286 }
287} 287}
288 288
289impl ToNav for hir::StructField { 289impl ToNav for hir::Field {
290 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 290 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
291 let src = self.source(db); 291 let src = self.source(db);
292 292
diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs
index 7a774785c..967eee5d2 100644
--- a/crates/ra_ide/src/display/structure.rs
+++ b/crates/ra_ide/src/display/structure.rs
@@ -224,8 +224,8 @@ fn very_obsolete() {}
224 StructureNode { 224 StructureNode {
225 parent: None, 225 parent: None,
226 label: "Foo", 226 label: "Foo",
227 navigation_range: [8; 11), 227 navigation_range: 8..11,
228 node_range: [1; 26), 228 node_range: 1..26,
229 kind: STRUCT_DEF, 229 kind: STRUCT_DEF,
230 detail: None, 230 detail: None,
231 deprecated: false, 231 deprecated: false,
@@ -235,8 +235,8 @@ fn very_obsolete() {}
235 0, 235 0,
236 ), 236 ),
237 label: "x", 237 label: "x",
238 navigation_range: [18; 19), 238 navigation_range: 18..19,
239 node_range: [18; 24), 239 node_range: 18..24,
240 kind: RECORD_FIELD_DEF, 240 kind: RECORD_FIELD_DEF,
241 detail: Some( 241 detail: Some(
242 "i32", 242 "i32",
@@ -246,8 +246,8 @@ fn very_obsolete() {}
246 StructureNode { 246 StructureNode {
247 parent: None, 247 parent: None,
248 label: "m", 248 label: "m",
249 navigation_range: [32; 33), 249 navigation_range: 32..33,
250 node_range: [28; 158), 250 node_range: 28..158,
251 kind: MODULE, 251 kind: MODULE,
252 detail: None, 252 detail: None,
253 deprecated: false, 253 deprecated: false,
@@ -257,8 +257,8 @@ fn very_obsolete() {}
257 2, 257 2,
258 ), 258 ),
259 label: "bar1", 259 label: "bar1",
260 navigation_range: [43; 47), 260 navigation_range: 43..47,
261 node_range: [40; 52), 261 node_range: 40..52,
262 kind: FN_DEF, 262 kind: FN_DEF,
263 detail: Some( 263 detail: Some(
264 "fn()", 264 "fn()",
@@ -270,8 +270,8 @@ fn very_obsolete() {}
270 2, 270 2,
271 ), 271 ),
272 label: "bar2", 272 label: "bar2",
273 navigation_range: [60; 64), 273 navigation_range: 60..64,
274 node_range: [57; 81), 274 node_range: 57..81,
275 kind: FN_DEF, 275 kind: FN_DEF,
276 detail: Some( 276 detail: Some(
277 "fn<T>(t: T) -> T", 277 "fn<T>(t: T) -> T",
@@ -283,8 +283,8 @@ fn very_obsolete() {}
283 2, 283 2,
284 ), 284 ),
285 label: "bar3", 285 label: "bar3",
286 navigation_range: [89; 93), 286 navigation_range: 89..93,
287 node_range: [86; 156), 287 node_range: 86..156,
288 kind: FN_DEF, 288 kind: FN_DEF,
289 detail: Some( 289 detail: Some(
290 "fn<A, B>(a: A, b: B) -> Vec< u32 >", 290 "fn<A, B>(a: A, b: B) -> Vec< u32 >",
@@ -294,8 +294,8 @@ fn very_obsolete() {}
294 StructureNode { 294 StructureNode {
295 parent: None, 295 parent: None,
296 label: "E", 296 label: "E",
297 navigation_range: [165; 166), 297 navigation_range: 165..166,
298 node_range: [160; 180), 298 node_range: 160..180,
299 kind: ENUM_DEF, 299 kind: ENUM_DEF,
300 detail: None, 300 detail: None,
301 deprecated: false, 301 deprecated: false,
@@ -305,8 +305,8 @@ fn very_obsolete() {}
305 6, 305 6,
306 ), 306 ),
307 label: "X", 307 label: "X",
308 navigation_range: [169; 170), 308 navigation_range: 169..170,
309 node_range: [169; 170), 309 node_range: 169..170,
310 kind: ENUM_VARIANT, 310 kind: ENUM_VARIANT,
311 detail: None, 311 detail: None,
312 deprecated: false, 312 deprecated: false,
@@ -316,8 +316,8 @@ fn very_obsolete() {}
316 6, 316 6,
317 ), 317 ),
318 label: "Y", 318 label: "Y",
319 navigation_range: [172; 173), 319 navigation_range: 172..173,
320 node_range: [172; 178), 320 node_range: 172..178,
321 kind: ENUM_VARIANT, 321 kind: ENUM_VARIANT,
322 detail: None, 322 detail: None,
323 deprecated: false, 323 deprecated: false,
@@ -325,8 +325,8 @@ fn very_obsolete() {}
325 StructureNode { 325 StructureNode {
326 parent: None, 326 parent: None,
327 label: "T", 327 label: "T",
328 navigation_range: [186; 187), 328 navigation_range: 186..187,
329 node_range: [181; 193), 329 node_range: 181..193,
330 kind: TYPE_ALIAS_DEF, 330 kind: TYPE_ALIAS_DEF,
331 detail: Some( 331 detail: Some(
332 "()", 332 "()",
@@ -336,8 +336,8 @@ fn very_obsolete() {}
336 StructureNode { 336 StructureNode {
337 parent: None, 337 parent: None,
338 label: "S", 338 label: "S",
339 navigation_range: [201; 202), 339 navigation_range: 201..202,
340 node_range: [194; 213), 340 node_range: 194..213,
341 kind: STATIC_DEF, 341 kind: STATIC_DEF,
342 detail: Some( 342 detail: Some(
343 "i32", 343 "i32",
@@ -347,8 +347,8 @@ fn very_obsolete() {}
347 StructureNode { 347 StructureNode {
348 parent: None, 348 parent: None,
349 label: "C", 349 label: "C",
350 navigation_range: [220; 221), 350 navigation_range: 220..221,
351 node_range: [214; 232), 351 node_range: 214..232,
352 kind: CONST_DEF, 352 kind: CONST_DEF,
353 detail: Some( 353 detail: Some(
354 "i32", 354 "i32",
@@ -358,8 +358,8 @@ fn very_obsolete() {}
358 StructureNode { 358 StructureNode {
359 parent: None, 359 parent: None,
360 label: "impl E", 360 label: "impl E",
361 navigation_range: [239; 240), 361 navigation_range: 239..240,
362 node_range: [234; 243), 362 node_range: 234..243,
363 kind: IMPL_DEF, 363 kind: IMPL_DEF,
364 detail: None, 364 detail: None,
365 deprecated: false, 365 deprecated: false,
@@ -367,8 +367,8 @@ fn very_obsolete() {}
367 StructureNode { 367 StructureNode {
368 parent: None, 368 parent: None,
369 label: "impl fmt::Debug for E", 369 label: "impl fmt::Debug for E",
370 navigation_range: [265; 266), 370 navigation_range: 265..266,
371 node_range: [245; 269), 371 node_range: 245..269,
372 kind: IMPL_DEF, 372 kind: IMPL_DEF,
373 detail: None, 373 detail: None,
374 deprecated: false, 374 deprecated: false,
@@ -376,8 +376,8 @@ fn very_obsolete() {}
376 StructureNode { 376 StructureNode {
377 parent: None, 377 parent: None,
378 label: "mc", 378 label: "mc",
379 navigation_range: [284; 286), 379 navigation_range: 284..286,
380 node_range: [271; 303), 380 node_range: 271..303,
381 kind: MACRO_CALL, 381 kind: MACRO_CALL,
382 detail: None, 382 detail: None,
383 deprecated: false, 383 deprecated: false,
@@ -385,8 +385,8 @@ fn very_obsolete() {}
385 StructureNode { 385 StructureNode {
386 parent: None, 386 parent: None,
387 label: "mcexp", 387 label: "mcexp",
388 navigation_range: [334; 339), 388 navigation_range: 334..339,
389 node_range: [305; 356), 389 node_range: 305..356,
390 kind: MACRO_CALL, 390 kind: MACRO_CALL,
391 detail: None, 391 detail: None,
392 deprecated: false, 392 deprecated: false,
@@ -394,8 +394,8 @@ fn very_obsolete() {}
394 StructureNode { 394 StructureNode {
395 parent: None, 395 parent: None,
396 label: "mcexp", 396 label: "mcexp",
397 navigation_range: [387; 392), 397 navigation_range: 387..392,
398 node_range: [358; 409), 398 node_range: 358..409,
399 kind: MACRO_CALL, 399 kind: MACRO_CALL,
400 detail: None, 400 detail: None,
401 deprecated: false, 401 deprecated: false,
@@ -403,8 +403,8 @@ fn very_obsolete() {}
403 StructureNode { 403 StructureNode {
404 parent: None, 404 parent: None,
405 label: "obsolete", 405 label: "obsolete",
406 navigation_range: [428; 436), 406 navigation_range: 428..436,
407 node_range: [411; 441), 407 node_range: 411..441,
408 kind: FN_DEF, 408 kind: FN_DEF,
409 detail: Some( 409 detail: Some(
410 "fn()", 410 "fn()",
@@ -414,8 +414,8 @@ fn very_obsolete() {}
414 StructureNode { 414 StructureNode {
415 parent: None, 415 parent: None,
416 label: "very_obsolete", 416 label: "very_obsolete",
417 navigation_range: [481; 494), 417 navigation_range: 481..494,
418 node_range: [443; 499), 418 node_range: 443..499,
419 kind: FN_DEF, 419 kind: FN_DEF,
420 detail: Some( 420 detail: Some(
421 "fn()", 421 "fn()",
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 753d2ef6a..554594a43 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -9,7 +9,7 @@ use ra_syntax::{
9 ast::{self, AstNode, AstToken}, 9 ast::{self, AstNode, AstToken},
10 Direction, NodeOrToken, 10 Direction, NodeOrToken,
11 SyntaxKind::{self, *}, 11 SyntaxKind::{self, *},
12 SyntaxNode, SyntaxToken, TextRange, TextUnit, TokenAtOffset, T, 12 SyntaxNode, SyntaxToken, TextRange, TextSize, TokenAtOffset, T,
13}; 13};
14 14
15use crate::FileRange; 15use crate::FileRange;
@@ -121,10 +121,10 @@ fn extend_tokens_from_range(
121 let mut first_token = skip_trivia_token(first_token, Direction::Next)?; 121 let mut first_token = skip_trivia_token(first_token, Direction::Next)?;
122 let mut last_token = skip_trivia_token(last_token, Direction::Prev)?; 122 let mut last_token = skip_trivia_token(last_token, Direction::Prev)?;
123 123
124 while !first_token.text_range().is_subrange(&original_range) { 124 while !original_range.contains_range(first_token.text_range()) {
125 first_token = skip_trivia_token(first_token.next_token()?, Direction::Next)?; 125 first_token = skip_trivia_token(first_token.next_token()?, Direction::Next)?;
126 } 126 }
127 while !last_token.text_range().is_subrange(&original_range) { 127 while !original_range.contains_range(last_token.text_range()) {
128 last_token = skip_trivia_token(last_token.prev_token()?, Direction::Prev)?; 128 last_token = skip_trivia_token(last_token.prev_token()?, Direction::Prev)?;
129 } 129 }
130 130
@@ -161,8 +161,8 @@ fn extend_tokens_from_range(
161 .take_while(validate) 161 .take_while(validate)
162 .last()?; 162 .last()?;
163 163
164 let range = first.text_range().extend_to(&last.text_range()); 164 let range = first.text_range().cover(last.text_range());
165 if original_range.is_subrange(&range) && original_range != range { 165 if range.contains_range(original_range) && original_range != range {
166 Some(range) 166 Some(range)
167 } else { 167 } else {
168 None 168 None
@@ -176,7 +176,7 @@ fn shallowest_node(node: &SyntaxNode) -> SyntaxNode {
176 176
177fn extend_single_word_in_comment_or_string( 177fn extend_single_word_in_comment_or_string(
178 leaf: &SyntaxToken, 178 leaf: &SyntaxToken,
179 offset: TextUnit, 179 offset: TextSize,
180) -> Option<TextRange> { 180) -> Option<TextRange> {
181 let text: &str = leaf.text(); 181 let text: &str = leaf.text();
182 let cursor_position: u32 = (offset - leaf.text_range().start()).into(); 182 let cursor_position: u32 = (offset - leaf.text_range().start()).into();
@@ -190,10 +190,10 @@ fn extend_single_word_in_comment_or_string(
190 let start_idx = before.rfind(non_word_char)? as u32; 190 let start_idx = before.rfind(non_word_char)? as u32;
191 let end_idx = after.find(non_word_char).unwrap_or_else(|| after.len()) as u32; 191 let end_idx = after.find(non_word_char).unwrap_or_else(|| after.len()) as u32;
192 192
193 let from: TextUnit = (start_idx + 1).into(); 193 let from: TextSize = (start_idx + 1).into();
194 let to: TextUnit = (cursor_position + end_idx).into(); 194 let to: TextSize = (cursor_position + end_idx).into();
195 195
196 let range = TextRange::from_to(from, to); 196 let range = TextRange::new(from, to);
197 if range.is_empty() { 197 if range.is_empty() {
198 None 198 None
199 } else { 199 } else {
@@ -201,24 +201,24 @@ fn extend_single_word_in_comment_or_string(
201 } 201 }
202} 202}
203 203
204fn extend_ws(root: &SyntaxNode, ws: SyntaxToken, offset: TextUnit) -> TextRange { 204fn extend_ws(root: &SyntaxNode, ws: SyntaxToken, offset: TextSize) -> TextRange {
205 let ws_text = ws.text(); 205 let ws_text = ws.text();
206 let suffix = TextRange::from_to(offset, ws.text_range().end()) - ws.text_range().start(); 206 let suffix = TextRange::new(offset, ws.text_range().end()) - ws.text_range().start();
207 let prefix = TextRange::from_to(ws.text_range().start(), offset) - ws.text_range().start(); 207 let prefix = TextRange::new(ws.text_range().start(), offset) - ws.text_range().start();
208 let ws_suffix = &ws_text.as_str()[suffix]; 208 let ws_suffix = &ws_text.as_str()[suffix];
209 let ws_prefix = &ws_text.as_str()[prefix]; 209 let ws_prefix = &ws_text.as_str()[prefix];
210 if ws_text.contains('\n') && !ws_suffix.contains('\n') { 210 if ws_text.contains('\n') && !ws_suffix.contains('\n') {
211 if let Some(node) = ws.next_sibling_or_token() { 211 if let Some(node) = ws.next_sibling_or_token() {
212 let start = match ws_prefix.rfind('\n') { 212 let start = match ws_prefix.rfind('\n') {
213 Some(idx) => ws.text_range().start() + TextUnit::from((idx + 1) as u32), 213 Some(idx) => ws.text_range().start() + TextSize::from((idx + 1) as u32),
214 None => node.text_range().start(), 214 None => node.text_range().start(),
215 }; 215 };
216 let end = if root.text().char_at(node.text_range().end()) == Some('\n') { 216 let end = if root.text().char_at(node.text_range().end()) == Some('\n') {
217 node.text_range().end() + TextUnit::of_char('\n') 217 node.text_range().end() + TextSize::of('\n')
218 } else { 218 } else {
219 node.text_range().end() 219 node.text_range().end()
220 }; 220 };
221 return TextRange::from_to(start, end); 221 return TextRange::new(start, end);
222 } 222 }
223 } 223 }
224 ws.text_range() 224 ws.text_range()
@@ -270,13 +270,10 @@ fn extend_list_item(node: &SyntaxNode) -> Option<TextRange> {
270 .filter(|node| is_single_line_ws(node)) 270 .filter(|node| is_single_line_ws(node))
271 .unwrap_or(delimiter_node); 271 .unwrap_or(delimiter_node);
272 272
273 return Some(TextRange::from_to(node.text_range().start(), final_node.text_range().end())); 273 return Some(TextRange::new(node.text_range().start(), final_node.text_range().end()));
274 } 274 }
275 if let Some(delimiter_node) = nearby_delimiter(delimiter, node, Direction::Prev) { 275 if let Some(delimiter_node) = nearby_delimiter(delimiter, node, Direction::Prev) {
276 return Some(TextRange::from_to( 276 return Some(TextRange::new(delimiter_node.text_range().start(), node.text_range().end()));
277 delimiter_node.text_range().start(),
278 node.text_range().end(),
279 ));
280 } 277 }
281 278
282 None 279 None
@@ -286,10 +283,7 @@ fn extend_comments(comment: ast::Comment) -> Option<TextRange> {
286 let prev = adj_comments(&comment, Direction::Prev); 283 let prev = adj_comments(&comment, Direction::Prev);
287 let next = adj_comments(&comment, Direction::Next); 284 let next = adj_comments(&comment, Direction::Next);
288 if prev != next { 285 if prev != next {
289 Some(TextRange::from_to( 286 Some(TextRange::new(prev.syntax().text_range().start(), next.syntax().text_range().end()))
290 prev.syntax().text_range().start(),
291 next.syntax().text_range().end(),
292 ))
293 } else { 287 } else {
294 None 288 None
295 } 289 }
@@ -322,7 +316,7 @@ mod tests {
322 fn do_check(before: &str, afters: &[&str]) { 316 fn do_check(before: &str, afters: &[&str]) {
323 let (cursor, before) = extract_offset(before); 317 let (cursor, before) = extract_offset(before);
324 let (analysis, file_id) = single_file(&before); 318 let (analysis, file_id) = single_file(&before);
325 let range = TextRange::offset_len(cursor, 0.into()); 319 let range = TextRange::empty(cursor);
326 let mut frange = FileRange { file_id, range }; 320 let mut frange = FileRange { file_id, range };
327 321
328 for &after in afters { 322 for &after in afters {
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 4eeb76d14..4379005aa 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -141,7 +141,7 @@ fn contiguous_range_for_group_unless(
141 } 141 }
142 142
143 if first != &last { 143 if first != &last {
144 Some(TextRange::from_to(first.text_range().start(), last.text_range().end())) 144 Some(TextRange::new(first.text_range().start(), last.text_range().end()))
145 } else { 145 } else {
146 // The group consists of only one element, therefore it cannot be folded 146 // The group consists of only one element, therefore it cannot be folded
147 None 147 None
@@ -187,10 +187,7 @@ fn contiguous_range_for_comment(
187 } 187 }
188 188
189 if first != last { 189 if first != last {
190 Some(TextRange::from_to( 190 Some(TextRange::new(first.syntax().text_range().start(), last.syntax().text_range().end()))
191 first.syntax().text_range().start(),
192 last.syntax().text_range().end(),
193 ))
194 } else { 191 } else {
195 // The group consists of only one element, therefore it cannot be folded 192 // The group consists of only one element, therefore it cannot be folded
196 None 193 None
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index 9998ca5a3..1dfca819d 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -140,7 +140,7 @@ mod tests {
140 struct Foo; 140 struct Foo;
141 enum E { X(Foo<|>) } 141 enum E { X(Foo<|>) }
142 ", 142 ",
143 "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)", 143 "Foo STRUCT_DEF FileId(1) 0..11 7..10",
144 "struct Foo;|Foo", 144 "struct Foo;|Foo",
145 ); 145 );
146 } 146 }
@@ -153,7 +153,7 @@ mod tests {
153 struct Foo; 153 struct Foo;
154 enum E { X(<|>Foo) } 154 enum E { X(<|>Foo) }
155 ", 155 ",
156 "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)", 156 "Foo STRUCT_DEF FileId(1) 0..11 7..10",
157 "struct Foo;|Foo", 157 "struct Foo;|Foo",
158 ); 158 );
159 } 159 }
@@ -174,7 +174,7 @@ mod tests {
174 //- /b.rs 174 //- /b.rs
175 struct Foo; 175 struct Foo;
176 ", 176 ",
177 "Foo STRUCT_DEF FileId(2) [0; 11) [7; 10)", 177 "Foo STRUCT_DEF FileId(2) 0..11 7..10",
178 "struct Foo;|Foo", 178 "struct Foo;|Foo",
179 ); 179 );
180 } 180 }
@@ -189,7 +189,7 @@ mod tests {
189 //- /foo.rs 189 //- /foo.rs
190 // empty 190 // empty
191 ", 191 ",
192 "foo SOURCE_FILE FileId(2) [0; 10)", 192 "foo SOURCE_FILE FileId(2) 0..10",
193 "// empty\n\n", 193 "// empty\n\n",
194 ); 194 );
195 195
@@ -201,7 +201,7 @@ mod tests {
201 //- /foo/mod.rs 201 //- /foo/mod.rs
202 // empty 202 // empty
203 ", 203 ",
204 "foo SOURCE_FILE FileId(2) [0; 10)", 204 "foo SOURCE_FILE FileId(2) 0..10",
205 "// empty\n\n", 205 "// empty\n\n",
206 ); 206 );
207 } 207 }
@@ -218,7 +218,7 @@ mod tests {
218 <|>foo!(); 218 <|>foo!();
219 } 219 }
220 ", 220 ",
221 "foo MACRO_CALL FileId(1) [0; 33) [13; 16)", 221 "foo MACRO_CALL FileId(1) 0..33 13..16",
222 "macro_rules! foo { () => { () } }|foo", 222 "macro_rules! foo { () => { () } }|foo",
223 ); 223 );
224 } 224 }
@@ -238,7 +238,7 @@ mod tests {
238 #[macro_export] 238 #[macro_export]
239 macro_rules! foo { () => { () } } 239 macro_rules! foo { () => { () } }
240 ", 240 ",
241 "foo MACRO_CALL FileId(2) [0; 49) [29; 32)", 241 "foo MACRO_CALL FileId(2) 0..49 29..32",
242 "#[macro_export]\nmacro_rules! foo { () => { () } }|foo", 242 "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
243 ); 243 );
244 } 244 }
@@ -254,7 +254,7 @@ mod tests {
254 #[macro_export] 254 #[macro_export]
255 macro_rules! foo { () => { () } } 255 macro_rules! foo { () => { () } }
256 ", 256 ",
257 "foo MACRO_CALL FileId(2) [0; 49) [29; 32)", 257 "foo MACRO_CALL FileId(2) 0..49 29..32",
258 "#[macro_export]\nmacro_rules! foo { () => { () } }|foo", 258 "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
259 ); 259 );
260 } 260 }
@@ -274,7 +274,7 @@ mod tests {
274 <|>foo(); 274 <|>foo();
275 } 275 }
276 ", 276 ",
277 "foo FN_DEF FileId(1) [64; 80) [75; 78)", 277 "foo FN_DEF FileId(1) 64..80 75..78",
278 "define_fn!(foo);|foo", 278 "define_fn!(foo);|foo",
279 ); 279 );
280 } 280 }
@@ -294,7 +294,7 @@ mod tests {
294 <|>foo(); 294 <|>foo();
295 } 295 }
296 ", 296 ",
297 "foo FN_DEF FileId(1) [51; 64) [51; 64)", 297 "foo FN_DEF FileId(1) 51..64 51..64",
298 "define_fn!();|define_fn!();", 298 "define_fn!();|define_fn!();",
299 ); 299 );
300 } 300 }
@@ -312,7 +312,7 @@ mod tests {
312 } 312 }
313 } 313 }
314 ", 314 ",
315 "foo MACRO_CALL FileId(1) [0; 28) [13; 16)", 315 "foo MACRO_CALL FileId(1) 0..28 13..16",
316 "macro_rules! foo {() => {0}}|foo", 316 "macro_rules! foo {() => {0}}|foo",
317 ); 317 );
318 } 318 }
@@ -330,7 +330,7 @@ mod tests {
330 } 330 }
331 } 331 }
332 ", 332 ",
333 "foo MACRO_CALL FileId(1) [0; 28) [13; 16)", 333 "foo MACRO_CALL FileId(1) 0..28 13..16",
334 "macro_rules! foo {() => {0}}|foo", 334 "macro_rules! foo {() => {0}}|foo",
335 ); 335 );
336 } 336 }
@@ -350,7 +350,7 @@ mod tests {
350 foo.frobnicate<|>(); 350 foo.frobnicate<|>();
351 } 351 }
352 ", 352 ",
353 "frobnicate FN_DEF FileId(1) [27; 51) [30; 40)", 353 "frobnicate FN_DEF FileId(1) 27..51 30..40",
354 "fn frobnicate(&self) { }|frobnicate", 354 "fn frobnicate(&self) { }|frobnicate",
355 ); 355 );
356 } 356 }
@@ -369,7 +369,7 @@ mod tests {
369 foo.spam<|>; 369 foo.spam<|>;
370 } 370 }
371 ", 371 ",
372 "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)", 372 "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
373 "spam: u32|spam", 373 "spam: u32|spam",
374 ); 374 );
375 } 375 }
@@ -390,7 +390,7 @@ mod tests {
390 } 390 }
391 } 391 }
392 ", 392 ",
393 "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)", 393 "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
394 "spam: u32|spam", 394 "spam: u32|spam",
395 ); 395 );
396 } 396 }
@@ -409,7 +409,7 @@ mod tests {
409 let Foo { spam<|>: _, } = foo 409 let Foo { spam<|>: _, } = foo
410 } 410 }
411 ", 411 ",
412 "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)", 412 "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
413 "spam: u32|spam", 413 "spam: u32|spam",
414 ); 414 );
415 } 415 }
@@ -426,7 +426,7 @@ mod tests {
426 Foo { spam<|>: m!() } 426 Foo { spam<|>: m!() }
427 } 427 }
428 ", 428 ",
429 "spam RECORD_FIELD_DEF FileId(1) [45; 54) [45; 49)", 429 "spam RECORD_FIELD_DEF FileId(1) 45..54 45..49",
430 "spam: u32|spam", 430 "spam: u32|spam",
431 ); 431 );
432 } 432 }
@@ -443,7 +443,7 @@ mod tests {
443 foo.<|>0; 443 foo.<|>0;
444 } 444 }
445 ", 445 ",
446 "TUPLE_FIELD_DEF FileId(1) [11; 14)", 446 "TUPLE_FIELD_DEF FileId(1) 11..14",
447 "u32", 447 "u32",
448 ); 448 );
449 } 449 }
@@ -462,7 +462,7 @@ mod tests {
462 Foo::frobnicate<|>(); 462 Foo::frobnicate<|>();
463 } 463 }
464 ", 464 ",
465 "frobnicate FN_DEF FileId(1) [27; 46) [30; 40)", 465 "frobnicate FN_DEF FileId(1) 27..46 30..40",
466 "fn frobnicate() { }|frobnicate", 466 "fn frobnicate() { }|frobnicate",
467 ); 467 );
468 } 468 }
@@ -480,7 +480,7 @@ mod tests {
480 Foo::frobnicate<|>(); 480 Foo::frobnicate<|>();
481 } 481 }
482 ", 482 ",
483 "frobnicate FN_DEF FileId(1) [16; 32) [19; 29)", 483 "frobnicate FN_DEF FileId(1) 16..32 19..29",
484 "fn frobnicate();|frobnicate", 484 "fn frobnicate();|frobnicate",
485 ); 485 );
486 } 486 }
@@ -500,7 +500,7 @@ mod tests {
500 Foo::frobnicate<|>(); 500 Foo::frobnicate<|>();
501 } 501 }
502 ", 502 ",
503 "frobnicate FN_DEF FileId(1) [30; 46) [33; 43)", 503 "frobnicate FN_DEF FileId(1) 30..46 33..43",
504 "fn frobnicate();|frobnicate", 504 "fn frobnicate();|frobnicate",
505 ); 505 );
506 } 506 }
@@ -517,7 +517,7 @@ mod tests {
517 } 517 }
518 } 518 }
519 ", 519 ",
520 "impl IMPL_DEF FileId(1) [12; 73)", 520 "impl IMPL_DEF FileId(1) 12..73",
521 "impl Foo {...}", 521 "impl Foo {...}",
522 ); 522 );
523 523
@@ -531,7 +531,7 @@ mod tests {
531 } 531 }
532 } 532 }
533 ", 533 ",
534 "impl IMPL_DEF FileId(1) [12; 73)", 534 "impl IMPL_DEF FileId(1) 12..73",
535 "impl Foo {...}", 535 "impl Foo {...}",
536 ); 536 );
537 537
@@ -545,7 +545,7 @@ mod tests {
545 } 545 }
546 } 546 }
547 ", 547 ",
548 "impl IMPL_DEF FileId(1) [15; 75)", 548 "impl IMPL_DEF FileId(1) 15..75",
549 "impl Foo {...}", 549 "impl Foo {...}",
550 ); 550 );
551 551
@@ -558,7 +558,7 @@ mod tests {
558 } 558 }
559 } 559 }
560 ", 560 ",
561 "impl IMPL_DEF FileId(1) [15; 62)", 561 "impl IMPL_DEF FileId(1) 15..62",
562 "impl Foo {...}", 562 "impl Foo {...}",
563 ); 563 );
564 } 564 }
@@ -578,7 +578,7 @@ mod tests {
578 } 578 }
579 } 579 }
580 ", 580 ",
581 "impl IMPL_DEF FileId(1) [49; 115)", 581 "impl IMPL_DEF FileId(1) 49..115",
582 "impl Make for Foo {...}", 582 "impl Make for Foo {...}",
583 ); 583 );
584 584
@@ -595,7 +595,7 @@ mod tests {
595 } 595 }
596 } 596 }
597 ", 597 ",
598 "impl IMPL_DEF FileId(1) [49; 115)", 598 "impl IMPL_DEF FileId(1) 49..115",
599 "impl Make for Foo {...}", 599 "impl Make for Foo {...}",
600 ); 600 );
601 } 601 }
@@ -607,7 +607,7 @@ mod tests {
607 //- /lib.rs 607 //- /lib.rs
608 struct Foo<|> { value: u32 } 608 struct Foo<|> { value: u32 }
609 ", 609 ",
610 "Foo STRUCT_DEF FileId(1) [0; 25) [7; 10)", 610 "Foo STRUCT_DEF FileId(1) 0..25 7..10",
611 "struct Foo { value: u32 }|Foo", 611 "struct Foo { value: u32 }|Foo",
612 ); 612 );
613 613
@@ -618,7 +618,7 @@ mod tests {
618 field<|>: string, 618 field<|>: string,
619 } 619 }
620 "#, 620 "#,
621 "field RECORD_FIELD_DEF FileId(1) [17; 30) [17; 22)", 621 "field RECORD_FIELD_DEF FileId(1) 17..30 17..22",
622 "field: string|field", 622 "field: string|field",
623 ); 623 );
624 624
@@ -627,7 +627,7 @@ mod tests {
627 //- /lib.rs 627 //- /lib.rs
628 fn foo_test<|>() { } 628 fn foo_test<|>() { }
629 ", 629 ",
630 "foo_test FN_DEF FileId(1) [0; 17) [3; 11)", 630 "foo_test FN_DEF FileId(1) 0..17 3..11",
631 "fn foo_test() { }|foo_test", 631 "fn foo_test() { }|foo_test",
632 ); 632 );
633 633
@@ -638,7 +638,7 @@ mod tests {
638 Variant, 638 Variant,
639 } 639 }
640 ", 640 ",
641 "Foo ENUM_DEF FileId(1) [0; 25) [5; 8)", 641 "Foo ENUM_DEF FileId(1) 0..25 5..8",
642 "enum Foo {...}|Foo", 642 "enum Foo {...}|Foo",
643 ); 643 );
644 644
@@ -651,7 +651,7 @@ mod tests {
651 Variant3, 651 Variant3,
652 } 652 }
653 ", 653 ",
654 "Variant2 ENUM_VARIANT FileId(1) [29; 37) [29; 37)", 654 "Variant2 ENUM_VARIANT FileId(1) 29..37 29..37",
655 "Variant2|Variant2", 655 "Variant2|Variant2",
656 ); 656 );
657 657
@@ -660,7 +660,7 @@ mod tests {
660 //- /lib.rs 660 //- /lib.rs
661 static INNER<|>: &str = ""; 661 static INNER<|>: &str = "";
662 "#, 662 "#,
663 "INNER STATIC_DEF FileId(1) [0; 24) [7; 12)", 663 "INNER STATIC_DEF FileId(1) 0..24 7..12",
664 "static INNER: &str = \"\";|INNER", 664 "static INNER: &str = \"\";|INNER",
665 ); 665 );
666 666
@@ -669,7 +669,7 @@ mod tests {
669 //- /lib.rs 669 //- /lib.rs
670 const INNER<|>: &str = ""; 670 const INNER<|>: &str = "";
671 "#, 671 "#,
672 "INNER CONST_DEF FileId(1) [0; 23) [6; 11)", 672 "INNER CONST_DEF FileId(1) 0..23 6..11",
673 "const INNER: &str = \"\";|INNER", 673 "const INNER: &str = \"\";|INNER",
674 ); 674 );
675 675
@@ -678,7 +678,7 @@ mod tests {
678 //- /lib.rs 678 //- /lib.rs
679 type Thing<|> = Option<()>; 679 type Thing<|> = Option<()>;
680 "#, 680 "#,
681 "Thing TYPE_ALIAS_DEF FileId(1) [0; 24) [5; 10)", 681 "Thing TYPE_ALIAS_DEF FileId(1) 0..24 5..10",
682 "type Thing = Option<()>;|Thing", 682 "type Thing = Option<()>;|Thing",
683 ); 683 );
684 684
@@ -687,7 +687,7 @@ mod tests {
687 //- /lib.rs 687 //- /lib.rs
688 trait Foo<|> { } 688 trait Foo<|> { }
689 "#, 689 "#,
690 "Foo TRAIT_DEF FileId(1) [0; 13) [6; 9)", 690 "Foo TRAIT_DEF FileId(1) 0..13 6..9",
691 "trait Foo { }|Foo", 691 "trait Foo { }|Foo",
692 ); 692 );
693 693
@@ -696,7 +696,7 @@ mod tests {
696 //- /lib.rs 696 //- /lib.rs
697 mod bar<|> { } 697 mod bar<|> { }
698 "#, 698 "#,
699 "bar MODULE FileId(1) [0; 11) [4; 7)", 699 "bar MODULE FileId(1) 0..11 4..7",
700 "mod bar { }|bar", 700 "mod bar { }|bar",
701 ); 701 );
702 } 702 }
@@ -717,7 +717,7 @@ mod tests {
717 } 717 }
718 mod confuse_index { fn foo(); } 718 mod confuse_index { fn foo(); }
719 ", 719 ",
720 "foo FN_DEF FileId(1) [52; 63) [55; 58)", 720 "foo FN_DEF FileId(1) 52..63 55..58",
721 "fn foo() {}|foo", 721 "fn foo() {}|foo",
722 ); 722 );
723 } 723 }
@@ -746,7 +746,7 @@ mod tests {
746 format!(\"{}\", fo<|>o()) 746 format!(\"{}\", fo<|>o())
747 } 747 }
748 ", 748 ",
749 "foo FN_DEF FileId(1) [398; 415) [401; 404)", 749 "foo FN_DEF FileId(1) 398..415 401..404",
750 "fn foo() -> i8 {}|foo", 750 "fn foo() -> i8 {}|foo",
751 ); 751 );
752 } 752 }
@@ -760,7 +760,7 @@ mod tests {
760 t: <|>T, 760 t: <|>T,
761 } 761 }
762 ", 762 ",
763 "T TYPE_PARAM FileId(1) [11; 12)", 763 "T TYPE_PARAM FileId(1) 11..12",
764 "T", 764 "T",
765 ); 765 );
766 } 766 }
@@ -782,7 +782,7 @@ mod tests {
782 }); 782 });
783 } 783 }
784 ", 784 ",
785 "x BIND_PAT FileId(1) [69; 70)", 785 "x BIND_PAT FileId(1) 69..70",
786 "x", 786 "x",
787 ); 787 );
788 788
@@ -801,7 +801,7 @@ mod tests {
801 }); 801 });
802 } 802 }
803 ", 803 ",
804 "y BIND_PAT FileId(1) [98; 99)", 804 "y BIND_PAT FileId(1) 98..99",
805 "y", 805 "y",
806 ); 806 );
807 } 807 }
@@ -818,7 +818,7 @@ mod tests {
818 } 818 }
819 } 819 }
820 ", 820 ",
821 "x BIND_PAT FileId(1) [39; 40)", 821 "x BIND_PAT FileId(1) 39..40",
822 "x", 822 "x",
823 ); 823 );
824 } 824 }
@@ -833,7 +833,7 @@ mod tests {
833 <|>foo!(); 833 <|>foo!();
834 } 834 }
835 ", 835 ",
836 "foo MACRO_CALL FileId(1) [15; 48) [28; 31)", 836 "foo MACRO_CALL FileId(1) 15..48 28..31",
837 "macro_rules! foo { () => { () } }|foo", 837 "macro_rules! foo { () => { () } }|foo",
838 ); 838 );
839 } 839 }
@@ -850,7 +850,7 @@ mod tests {
850 Foo { x<|> }; 850 Foo { x<|> };
851 } 851 }
852 ", 852 ",
853 "x BIND_PAT FileId(1) [42; 43)", 853 "x BIND_PAT FileId(1) 42..43",
854 "x", 854 "x",
855 ) 855 )
856 } 856 }
diff --git a/crates/ra_ide/src/goto_type_definition.rs b/crates/ra_ide/src/goto_type_definition.rs
index bd2688df1..a84637489 100644
--- a/crates/ra_ide/src/goto_type_definition.rs
+++ b/crates/ra_ide/src/goto_type_definition.rs
@@ -68,7 +68,7 @@ mod tests {
68 f<|> 68 f<|>
69 } 69 }
70 ", 70 ",
71 "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)", 71 "Foo STRUCT_DEF FileId(1) 0..11 7..10",
72 ); 72 );
73 } 73 }
74 74
@@ -83,7 +83,7 @@ mod tests {
83 f<|> 83 f<|>
84 } 84 }
85 ", 85 ",
86 "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)", 86 "Foo STRUCT_DEF FileId(1) 0..11 7..10",
87 ); 87 );
88 } 88 }
89 89
@@ -102,7 +102,7 @@ mod tests {
102 } 102 }
103 } 103 }
104 ", 104 ",
105 "Foo STRUCT_DEF FileId(1) [52; 65) [59; 62)", 105 "Foo STRUCT_DEF FileId(1) 52..65 59..62",
106 ); 106 );
107 } 107 }
108 108
@@ -114,7 +114,7 @@ mod tests {
114 struct Foo; 114 struct Foo;
115 fn foo(<|>f: Foo) {} 115 fn foo(<|>f: Foo) {}
116 ", 116 ",
117 "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)", 117 "Foo STRUCT_DEF FileId(1) 0..11 7..10",
118 ); 118 );
119 } 119 }
120 120
@@ -130,7 +130,7 @@ mod tests {
130 bar.<|>0; 130 bar.<|>0;
131 } 131 }
132 ", 132 ",
133 "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)", 133 "Foo STRUCT_DEF FileId(1) 0..11 7..10",
134 ); 134 );
135 } 135 }
136} 136}
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index a31187994..58c799eca 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -76,7 +76,7 @@ fn hover_text(
76 76
77fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String> { 77fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String> {
78 match def { 78 match def {
79 Definition::StructField(f) => Some(f.parent_def(db).name(db)), 79 Definition::Field(f) => Some(f.parent_def(db).name(db)),
80 Definition::Local(l) => l.parent(db).name(db), 80 Definition::Local(l) => l.parent(db).name(db),
81 Definition::ModuleDef(md) => match md { 81 Definition::ModuleDef(md) => match md {
82 ModuleDef::Function(f) => match f.as_assoc_item(db)?.container(db) { 82 ModuleDef::Function(f) => match f.as_assoc_item(db)?.container(db) {
@@ -116,7 +116,7 @@ fn hover_text_from_name_kind(db: &RootDatabase, def: Definition) -> Option<Strin
116 let src = it.source(db); 116 let src = it.source(db);
117 hover_text(src.value.doc_comment_text(), Some(macro_label(&src.value)), mod_path) 117 hover_text(src.value.doc_comment_text(), Some(macro_label(&src.value)), mod_path)
118 } 118 }
119 Definition::StructField(it) => { 119 Definition::Field(it) => {
120 let src = it.source(db); 120 let src = it.source(db);
121 match src.value { 121 match src.value {
122 FieldSource::Named(it) => { 122 FieldSource::Named(it) => {
@@ -275,7 +275,7 @@ mod tests {
275 ", 275 ",
276 ); 276 );
277 let hover = analysis.hover(position).unwrap().unwrap(); 277 let hover = analysis.hover(position).unwrap().unwrap();
278 assert_eq!(hover.range, TextRange::from_to(95.into(), 100.into())); 278 assert_eq!(hover.range, TextRange::new(95.into(), 100.into()));
279 assert_eq!(trim_markup_opt(hover.info.first()), Some("u32")); 279 assert_eq!(trim_markup_opt(hover.info.first()), Some("u32"));
280 } 280 }
281 281
diff --git a/crates/ra_ide/src/impls.rs b/crates/ra_ide/src/impls.rs
index 68529c8a5..ea2225f70 100644
--- a/crates/ra_ide/src/impls.rs
+++ b/crates/ra_ide/src/impls.rs
@@ -86,7 +86,7 @@ mod tests {
86 struct Foo<|>; 86 struct Foo<|>;
87 impl Foo {} 87 impl Foo {}
88 ", 88 ",
89 &["impl IMPL_DEF FileId(1) [12; 23)"], 89 &["impl IMPL_DEF FileId(1) 12..23"],
90 ); 90 );
91 } 91 }
92 92
@@ -99,7 +99,7 @@ mod tests {
99 impl Foo {} 99 impl Foo {}
100 impl Foo {} 100 impl Foo {}
101 ", 101 ",
102 &["impl IMPL_DEF FileId(1) [12; 23)", "impl IMPL_DEF FileId(1) [24; 35)"], 102 &["impl IMPL_DEF FileId(1) 12..23", "impl IMPL_DEF FileId(1) 24..35"],
103 ); 103 );
104 } 104 }
105 105
@@ -116,7 +116,7 @@ mod tests {
116 impl super::Foo {} 116 impl super::Foo {}
117 } 117 }
118 ", 118 ",
119 &["impl IMPL_DEF FileId(1) [24; 42)", "impl IMPL_DEF FileId(1) [57; 75)"], 119 &["impl IMPL_DEF FileId(1) 24..42", "impl IMPL_DEF FileId(1) 57..75"],
120 ); 120 );
121 } 121 }
122 122
@@ -133,7 +133,7 @@ mod tests {
133 //- /b.rs 133 //- /b.rs
134 impl crate::Foo {} 134 impl crate::Foo {}
135 ", 135 ",
136 &["impl IMPL_DEF FileId(2) [0; 18)", "impl IMPL_DEF FileId(3) [0; 18)"], 136 &["impl IMPL_DEF FileId(2) 0..18", "impl IMPL_DEF FileId(3) 0..18"],
137 ); 137 );
138 } 138 }
139 139
@@ -146,7 +146,7 @@ mod tests {
146 struct Foo; 146 struct Foo;
147 impl T for Foo {} 147 impl T for Foo {}
148 ", 148 ",
149 &["impl IMPL_DEF FileId(1) [23; 40)"], 149 &["impl IMPL_DEF FileId(1) 23..40"],
150 ); 150 );
151 } 151 }
152 152
@@ -164,7 +164,7 @@ mod tests {
164 //- /b.rs 164 //- /b.rs
165 impl crate::T for crate::Foo {} 165 impl crate::T for crate::Foo {}
166 ", 166 ",
167 &["impl IMPL_DEF FileId(2) [0; 31)", "impl IMPL_DEF FileId(3) [0; 31)"], 167 &["impl IMPL_DEF FileId(2) 0..31", "impl IMPL_DEF FileId(3) 0..31"],
168 ); 168 );
169 } 169 }
170 170
@@ -180,9 +180,9 @@ mod tests {
180 impl T for &Foo {} 180 impl T for &Foo {}
181 ", 181 ",
182 &[ 182 &[
183 "impl IMPL_DEF FileId(1) [23; 34)", 183 "impl IMPL_DEF FileId(1) 23..34",
184 "impl IMPL_DEF FileId(1) [35; 52)", 184 "impl IMPL_DEF FileId(1) 35..52",
185 "impl IMPL_DEF FileId(1) [53; 71)", 185 "impl IMPL_DEF FileId(1) 53..71",
186 ], 186 ],
187 ); 187 );
188 } 188 }
@@ -195,7 +195,7 @@ mod tests {
195 #[derive(Copy)] 195 #[derive(Copy)]
196 struct Foo<|>; 196 struct Foo<|>;
197 ", 197 ",
198 &["impl IMPL_DEF FileId(1) [0; 15)"], 198 &["impl IMPL_DEF FileId(1) 0..15"],
199 ); 199 );
200 } 200 }
201} 201}
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 0774fa0a1..98483df32 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -322,12 +322,12 @@ mod tests {
322 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: true, type_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###" 322 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: true, type_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
323 [ 323 [
324 InlayHint { 324 InlayHint {
325 range: [106; 107), 325 range: 106..107,
326 kind: ParameterHint, 326 kind: ParameterHint,
327 label: "a", 327 label: "a",
328 }, 328 },
329 InlayHint { 329 InlayHint {
330 range: [109; 110), 330 range: 109..110,
331 kind: ParameterHint, 331 kind: ParameterHint,
332 label: "b", 332 label: "b",
333 }, 333 },
@@ -358,7 +358,7 @@ mod tests {
358 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ type_hints: true, parameter_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###" 358 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ type_hints: true, parameter_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
359 [ 359 [
360 InlayHint { 360 InlayHint {
361 range: [97; 99), 361 range: 97..99,
362 kind: TypeHint, 362 kind: TypeHint,
363 label: "i32", 363 label: "i32",
364 }, 364 },
@@ -382,12 +382,12 @@ fn main() {
382 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 382 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
383 [ 383 [
384 InlayHint { 384 InlayHint {
385 range: [69; 71), 385 range: 69..71,
386 kind: TypeHint, 386 kind: TypeHint,
387 label: "Test<i32>", 387 label: "Test<i32>",
388 }, 388 },
389 InlayHint { 389 InlayHint {
390 range: [105; 111), 390 range: 105..111,
391 kind: TypeHint, 391 kind: TypeHint,
392 label: "&Test<i32>", 392 label: "&Test<i32>",
393 }, 393 },
@@ -439,57 +439,57 @@ fn main() {
439 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 439 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
440 [ 440 [
441 InlayHint { 441 InlayHint {
442 range: [193; 197), 442 range: 193..197,
443 kind: TypeHint, 443 kind: TypeHint,
444 label: "i32", 444 label: "i32",
445 }, 445 },
446 InlayHint { 446 InlayHint {
447 range: [236; 244), 447 range: 236..244,
448 kind: TypeHint, 448 kind: TypeHint,
449 label: "i32", 449 label: "i32",
450 }, 450 },
451 InlayHint { 451 InlayHint {
452 range: [275; 279), 452 range: 275..279,
453 kind: TypeHint, 453 kind: TypeHint,
454 label: "&str", 454 label: "&str",
455 }, 455 },
456 InlayHint { 456 InlayHint {
457 range: [539; 543), 457 range: 539..543,
458 kind: TypeHint, 458 kind: TypeHint,
459 label: "(i32, char)", 459 label: "(i32, char)",
460 }, 460 },
461 InlayHint { 461 InlayHint {
462 range: [566; 567), 462 range: 566..567,
463 kind: TypeHint, 463 kind: TypeHint,
464 label: "i32", 464 label: "i32",
465 }, 465 },
466 InlayHint { 466 InlayHint {
467 range: [570; 571), 467 range: 570..571,
468 kind: TypeHint, 468 kind: TypeHint,
469 label: "i32", 469 label: "i32",
470 }, 470 },
471 InlayHint { 471 InlayHint {
472 range: [573; 574), 472 range: 573..574,
473 kind: TypeHint, 473 kind: TypeHint,
474 label: "i32", 474 label: "i32",
475 }, 475 },
476 InlayHint { 476 InlayHint {
477 range: [577; 578), 477 range: 577..578,
478 kind: TypeHint, 478 kind: TypeHint,
479 label: "f64", 479 label: "f64",
480 }, 480 },
481 InlayHint { 481 InlayHint {
482 range: [580; 581), 482 range: 580..581,
483 kind: TypeHint, 483 kind: TypeHint,
484 label: "f64", 484 label: "f64",
485 }, 485 },
486 InlayHint { 486 InlayHint {
487 range: [584; 585), 487 range: 584..585,
488 kind: TypeHint, 488 kind: TypeHint,
489 label: "i32", 489 label: "i32",
490 }, 490 },
491 InlayHint { 491 InlayHint {
492 range: [627; 628), 492 range: 627..628,
493 kind: TypeHint, 493 kind: TypeHint,
494 label: "i32", 494 label: "i32",
495 }, 495 },
@@ -519,47 +519,47 @@ fn main() {
519 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 519 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
520 [ 520 [
521 InlayHint { 521 InlayHint {
522 range: [21; 30), 522 range: 21..30,
523 kind: TypeHint, 523 kind: TypeHint,
524 label: "i32", 524 label: "i32",
525 }, 525 },
526 InlayHint { 526 InlayHint {
527 range: [57; 66), 527 range: 57..66,
528 kind: TypeHint, 528 kind: TypeHint,
529 label: "i32", 529 label: "i32",
530 }, 530 },
531 InlayHint { 531 InlayHint {
532 range: [115; 123), 532 range: 115..123,
533 kind: TypeHint, 533 kind: TypeHint,
534 label: "|…| -> i32", 534 label: "|…| -> i32",
535 }, 535 },
536 InlayHint { 536 InlayHint {
537 range: [127; 128), 537 range: 127..128,
538 kind: TypeHint, 538 kind: TypeHint,
539 label: "i32", 539 label: "i32",
540 }, 540 },
541 InlayHint { 541 InlayHint {
542 range: [130; 131), 542 range: 130..131,
543 kind: TypeHint, 543 kind: TypeHint,
544 label: "i32", 544 label: "i32",
545 }, 545 },
546 InlayHint { 546 InlayHint {
547 range: [133; 134), 547 range: 133..134,
548 kind: TypeHint, 548 kind: TypeHint,
549 label: "i32", 549 label: "i32",
550 }, 550 },
551 InlayHint { 551 InlayHint {
552 range: [136; 137), 552 range: 136..137,
553 kind: TypeHint, 553 kind: TypeHint,
554 label: "i32", 554 label: "i32",
555 }, 555 },
556 InlayHint { 556 InlayHint {
557 range: [201; 213), 557 range: 201..213,
558 kind: TypeHint, 558 kind: TypeHint,
559 label: "&|…| -> i32", 559 label: "&|…| -> i32",
560 }, 560 },
561 InlayHint { 561 InlayHint {
562 range: [236; 245), 562 range: 236..245,
563 kind: TypeHint, 563 kind: TypeHint,
564 label: "|| -> i32", 564 label: "|| -> i32",
565 }, 565 },
@@ -583,12 +583,12 @@ fn main() {
583 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 583 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
584 [ 584 [
585 InlayHint { 585 InlayHint {
586 range: [21; 30), 586 range: 21..30,
587 kind: TypeHint, 587 kind: TypeHint,
588 label: "i32", 588 label: "i32",
589 }, 589 },
590 InlayHint { 590 InlayHint {
591 range: [44; 53), 591 range: 44..53,
592 kind: TypeHint, 592 kind: TypeHint,
593 label: "i32", 593 label: "i32",
594 }, 594 },
@@ -633,57 +633,57 @@ fn main() {
633 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 633 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
634 [ 634 [
635 InlayHint { 635 InlayHint {
636 range: [188; 192), 636 range: 188..192,
637 kind: TypeHint, 637 kind: TypeHint,
638 label: "CustomOption<Test>", 638 label: "CustomOption<Test>",
639 }, 639 },
640 InlayHint { 640 InlayHint {
641 range: [267; 271), 641 range: 267..271,
642 kind: TypeHint, 642 kind: TypeHint,
643 label: "&CustomOption<Test>", 643 label: "&CustomOption<Test>",
644 }, 644 },
645 InlayHint { 645 InlayHint {
646 range: [300; 304), 646 range: 300..304,
647 kind: TypeHint, 647 kind: TypeHint,
648 label: "&Test", 648 label: "&Test",
649 }, 649 },
650 InlayHint { 650 InlayHint {
651 range: [341; 342), 651 range: 341..342,
652 kind: TypeHint, 652 kind: TypeHint,
653 label: "&CustomOption<u32>", 653 label: "&CustomOption<u32>",
654 }, 654 },
655 InlayHint { 655 InlayHint {
656 range: [344; 345), 656 range: 344..345,
657 kind: TypeHint, 657 kind: TypeHint,
658 label: "&u8", 658 label: "&u8",
659 }, 659 },
660 InlayHint { 660 InlayHint {
661 range: [387; 388), 661 range: 387..388,
662 kind: TypeHint, 662 kind: TypeHint,
663 label: "&CustomOption<u32>", 663 label: "&CustomOption<u32>",
664 }, 664 },
665 InlayHint { 665 InlayHint {
666 range: [393; 394), 666 range: 393..394,
667 kind: TypeHint, 667 kind: TypeHint,
668 label: "&u8", 668 label: "&u8",
669 }, 669 },
670 InlayHint { 670 InlayHint {
671 range: [441; 442), 671 range: 441..442,
672 kind: TypeHint, 672 kind: TypeHint,
673 label: "&u32", 673 label: "&u32",
674 }, 674 },
675 InlayHint { 675 InlayHint {
676 range: [448; 449), 676 range: 448..449,
677 kind: TypeHint, 677 kind: TypeHint,
678 label: "&u8", 678 label: "&u8",
679 }, 679 },
680 InlayHint { 680 InlayHint {
681 range: [500; 501), 681 range: 500..501,
682 kind: TypeHint, 682 kind: TypeHint,
683 label: "&u8", 683 label: "&u8",
684 }, 684 },
685 InlayHint { 685 InlayHint {
686 range: [543; 544), 686 range: 543..544,
687 kind: TypeHint, 687 kind: TypeHint,
688 label: "&u8", 688 label: "&u8",
689 }, 689 },
@@ -728,57 +728,57 @@ fn main() {
728 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 728 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
729 [ 729 [
730 InlayHint { 730 InlayHint {
731 range: [188; 192), 731 range: 188..192,
732 kind: TypeHint, 732 kind: TypeHint,
733 label: "CustomOption<Test>", 733 label: "CustomOption<Test>",
734 }, 734 },
735 InlayHint { 735 InlayHint {
736 range: [273; 277), 736 range: 273..277,
737 kind: TypeHint, 737 kind: TypeHint,
738 label: "&CustomOption<Test>", 738 label: "&CustomOption<Test>",
739 }, 739 },
740 InlayHint { 740 InlayHint {
741 range: [309; 313), 741 range: 309..313,
742 kind: TypeHint, 742 kind: TypeHint,
743 label: "&Test", 743 label: "&Test",
744 }, 744 },
745 InlayHint { 745 InlayHint {
746 range: [353; 354), 746 range: 353..354,
747 kind: TypeHint, 747 kind: TypeHint,
748 label: "&CustomOption<u32>", 748 label: "&CustomOption<u32>",
749 }, 749 },
750 InlayHint { 750 InlayHint {
751 range: [356; 357), 751 range: 356..357,
752 kind: TypeHint, 752 kind: TypeHint,
753 label: "&u8", 753 label: "&u8",
754 }, 754 },
755 InlayHint { 755 InlayHint {
756 range: [402; 403), 756 range: 402..403,
757 kind: TypeHint, 757 kind: TypeHint,
758 label: "&CustomOption<u32>", 758 label: "&CustomOption<u32>",
759 }, 759 },
760 InlayHint { 760 InlayHint {
761 range: [408; 409), 761 range: 408..409,
762 kind: TypeHint, 762 kind: TypeHint,
763 label: "&u8", 763 label: "&u8",
764 }, 764 },
765 InlayHint { 765 InlayHint {
766 range: [459; 460), 766 range: 459..460,
767 kind: TypeHint, 767 kind: TypeHint,
768 label: "&u32", 768 label: "&u32",
769 }, 769 },
770 InlayHint { 770 InlayHint {
771 range: [466; 467), 771 range: 466..467,
772 kind: TypeHint, 772 kind: TypeHint,
773 label: "&u8", 773 label: "&u8",
774 }, 774 },
775 InlayHint { 775 InlayHint {
776 range: [521; 522), 776 range: 521..522,
777 kind: TypeHint, 777 kind: TypeHint,
778 label: "&u8", 778 label: "&u8",
779 }, 779 },
780 InlayHint { 780 InlayHint {
781 range: [567; 568), 781 range: 567..568,
782 kind: TypeHint, 782 kind: TypeHint,
783 label: "&u8", 783 label: "&u8",
784 }, 784 },
@@ -823,52 +823,52 @@ fn main() {
823 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 823 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
824 [ 824 [
825 InlayHint { 825 InlayHint {
826 range: [252; 256), 826 range: 252..256,
827 kind: TypeHint, 827 kind: TypeHint,
828 label: "CustomOption<Test>", 828 label: "CustomOption<Test>",
829 }, 829 },
830 InlayHint { 830 InlayHint {
831 range: [277; 281), 831 range: 277..281,
832 kind: TypeHint, 832 kind: TypeHint,
833 label: "Test", 833 label: "Test",
834 }, 834 },
835 InlayHint { 835 InlayHint {
836 range: [310; 311), 836 range: 310..311,
837 kind: TypeHint, 837 kind: TypeHint,
838 label: "CustomOption<u32>", 838 label: "CustomOption<u32>",
839 }, 839 },
840 InlayHint { 840 InlayHint {
841 range: [313; 314), 841 range: 313..314,
842 kind: TypeHint, 842 kind: TypeHint,
843 label: "u8", 843 label: "u8",
844 }, 844 },
845 InlayHint { 845 InlayHint {
846 range: [348; 349), 846 range: 348..349,
847 kind: TypeHint, 847 kind: TypeHint,
848 label: "CustomOption<u32>", 848 label: "CustomOption<u32>",
849 }, 849 },
850 InlayHint { 850 InlayHint {
851 range: [354; 355), 851 range: 354..355,
852 kind: TypeHint, 852 kind: TypeHint,
853 label: "u8", 853 label: "u8",
854 }, 854 },
855 InlayHint { 855 InlayHint {
856 range: [394; 395), 856 range: 394..395,
857 kind: TypeHint, 857 kind: TypeHint,
858 label: "u32", 858 label: "u32",
859 }, 859 },
860 InlayHint { 860 InlayHint {
861 range: [401; 402), 861 range: 401..402,
862 kind: TypeHint, 862 kind: TypeHint,
863 label: "u8", 863 label: "u8",
864 }, 864 },
865 InlayHint { 865 InlayHint {
866 range: [445; 446), 866 range: 445..446,
867 kind: TypeHint, 867 kind: TypeHint,
868 label: "u8", 868 label: "u8",
869 }, 869 },
870 InlayHint { 870 InlayHint {
871 range: [480; 481), 871 range: 480..481,
872 kind: TypeHint, 872 kind: TypeHint,
873 label: "u8", 873 label: "u8",
874 }, 874 },
@@ -895,17 +895,17 @@ fn main() {
895 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###" 895 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
896 [ 896 [
897 InlayHint { 897 InlayHint {
898 range: [74; 75), 898 range: 74..75,
899 kind: TypeHint, 899 kind: TypeHint,
900 label: "Smol<u32>", 900 label: "Smol<u32>",
901 }, 901 },
902 InlayHint { 902 InlayHint {
903 range: [98; 99), 903 range: 98..99,
904 kind: TypeHint, 904 kind: TypeHint,
905 label: "VeryLongOuterName<…>", 905 label: "VeryLongOuterName<…>",
906 }, 906 },
907 InlayHint { 907 InlayHint {
908 range: [137; 138), 908 range: 137..138,
909 kind: TypeHint, 909 kind: TypeHint,
910 label: "Smol<Smol<…>>", 910 label: "Smol<Smol<…>>",
911 }, 911 },
@@ -983,77 +983,77 @@ fn main() {
983 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###" 983 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
984 [ 984 [
985 InlayHint { 985 InlayHint {
986 range: [798; 809), 986 range: 798..809,
987 kind: TypeHint, 987 kind: TypeHint,
988 label: "i32", 988 label: "i32",
989 }, 989 },
990 InlayHint { 990 InlayHint {
991 range: [842; 843), 991 range: 842..843,
992 kind: ParameterHint, 992 kind: ParameterHint,
993 label: "foo", 993 label: "foo",
994 }, 994 },
995 InlayHint { 995 InlayHint {
996 range: [845; 846), 996 range: 845..846,
997 kind: ParameterHint, 997 kind: ParameterHint,
998 label: "bar", 998 label: "bar",
999 }, 999 },
1000 InlayHint { 1000 InlayHint {
1001 range: [848; 855), 1001 range: 848..855,
1002 kind: ParameterHint, 1002 kind: ParameterHint,
1003 label: "msg", 1003 label: "msg",
1004 }, 1004 },
1005 InlayHint { 1005 InlayHint {
1006 range: [860; 871), 1006 range: 860..871,
1007 kind: ParameterHint, 1007 kind: ParameterHint,
1008 label: "last", 1008 label: "last",
1009 }, 1009 },
1010 InlayHint { 1010 InlayHint {
1011 range: [914; 917), 1011 range: 914..917,
1012 kind: ParameterHint, 1012 kind: ParameterHint,
1013 label: "param", 1013 label: "param",
1014 }, 1014 },
1015 InlayHint { 1015 InlayHint {
1016 range: [937; 939), 1016 range: 937..939,
1017 kind: ParameterHint, 1017 kind: ParameterHint,
1018 label: "&self", 1018 label: "&self",
1019 }, 1019 },
1020 InlayHint { 1020 InlayHint {
1021 range: [941; 945), 1021 range: 941..945,
1022 kind: ParameterHint, 1022 kind: ParameterHint,
1023 label: "param", 1023 label: "param",
1024 }, 1024 },
1025 InlayHint { 1025 InlayHint {
1026 range: [980; 989), 1026 range: 980..989,
1027 kind: ParameterHint, 1027 kind: ParameterHint,
1028 label: "file_id", 1028 label: "file_id",
1029 }, 1029 },
1030 InlayHint { 1030 InlayHint {
1031 range: [999; 1012), 1031 range: 999..1012,
1032 kind: ParameterHint, 1032 kind: ParameterHint,
1033 label: "name", 1033 label: "name",
1034 }, 1034 },
1035 InlayHint { 1035 InlayHint {
1036 range: [1022; 1026), 1036 range: 1022..1026,
1037 kind: ParameterHint, 1037 kind: ParameterHint,
1038 label: "focus_range", 1038 label: "focus_range",
1039 }, 1039 },
1040 InlayHint { 1040 InlayHint {
1041 range: [1036; 1048), 1041 range: 1036..1048,
1042 kind: ParameterHint, 1042 kind: ParameterHint,
1043 label: "full_range", 1043 label: "full_range",
1044 }, 1044 },
1045 InlayHint { 1045 InlayHint {
1046 range: [1058; 1071), 1046 range: 1058..1071,
1047 kind: ParameterHint, 1047 kind: ParameterHint,
1048 label: "kind", 1048 label: "kind",
1049 }, 1049 },
1050 InlayHint { 1050 InlayHint {
1051 range: [1081; 1085), 1051 range: 1081..1085,
1052 kind: ParameterHint, 1052 kind: ParameterHint,
1053 label: "docs", 1053 label: "docs",
1054 }, 1054 },
1055 InlayHint { 1055 InlayHint {
1056 range: [1095; 1099), 1056 range: 1095..1099,
1057 kind: ParameterHint, 1057 kind: ParameterHint,
1058 label: "description", 1058 label: "description",
1059 }, 1059 },
@@ -1184,12 +1184,12 @@ fn main() {
1184 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###" 1184 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
1185 [ 1185 [
1186 InlayHint { 1186 InlayHint {
1187 range: [232; 269), 1187 range: 232..269,
1188 kind: ChainingHint, 1188 kind: ChainingHint,
1189 label: "B", 1189 label: "B",
1190 }, 1190 },
1191 InlayHint { 1191 InlayHint {
1192 range: [232; 239), 1192 range: 232..239,
1193 kind: ChainingHint, 1193 kind: ChainingHint,
1194 label: "A", 1194 label: "A",
1195 }, 1195 },
@@ -1238,12 +1238,12 @@ fn main() {
1238 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###" 1238 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
1239 [ 1239 [
1240 InlayHint { 1240 InlayHint {
1241 range: [252; 323), 1241 range: 252..323,
1242 kind: ChainingHint, 1242 kind: ChainingHint,
1243 label: "C", 1243 label: "C",
1244 }, 1244 },
1245 InlayHint { 1245 InlayHint {
1246 range: [252; 300), 1246 range: 252..300,
1247 kind: ChainingHint, 1247 kind: ChainingHint,
1248 label: "B", 1248 label: "B",
1249 }, 1249 },
@@ -1276,12 +1276,12 @@ fn main() {
1276 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###" 1276 assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
1277 [ 1277 [
1278 InlayHint { 1278 InlayHint {
1279 range: [403; 452), 1279 range: 403..452,
1280 kind: ChainingHint, 1280 kind: ChainingHint,
1281 label: "B<X<i32, bool>>", 1281 label: "B<X<i32, bool>>",
1282 }, 1282 },
1283 InlayHint { 1283 InlayHint {
1284 range: [403; 422), 1284 range: 403..422,
1285 kind: ChainingHint, 1285 kind: ChainingHint,
1286 label: "A<X<i32, bool>>", 1286 label: "A<X<i32, bool>>",
1287 }, 1287 },
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index 7d70dab9c..fde0bfa98 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -7,7 +7,7 @@ use ra_syntax::{
7 ast::{self, AstNode, AstToken}, 7 ast::{self, AstNode, AstToken},
8 Direction, NodeOrToken, SourceFile, 8 Direction, NodeOrToken, SourceFile,
9 SyntaxKind::{self, WHITESPACE}, 9 SyntaxKind::{self, WHITESPACE},
10 SyntaxNode, SyntaxToken, TextRange, TextUnit, T, 10 SyntaxNode, SyntaxToken, TextRange, TextSize, T,
11}; 11};
12use ra_text_edit::{TextEdit, TextEditBuilder}; 12use ra_text_edit::{TextEdit, TextEditBuilder};
13 13
@@ -19,7 +19,7 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
19 None => return TextEditBuilder::default().finish(), 19 None => return TextEditBuilder::default().finish(),
20 Some(pos) => pos, 20 Some(pos) => pos,
21 }; 21 };
22 TextRange::offset_len(range.start() + pos, TextUnit::of_char('\n')) 22 TextRange::at(range.start() + pos, TextSize::of('\n'))
23 } else { 23 } else {
24 range 24 range
25 }; 25 };
@@ -30,13 +30,13 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
30 }; 30 };
31 let mut edit = TextEditBuilder::default(); 31 let mut edit = TextEditBuilder::default();
32 for token in node.descendants_with_tokens().filter_map(|it| it.into_token()) { 32 for token in node.descendants_with_tokens().filter_map(|it| it.into_token()) {
33 let range = match range.intersection(&token.text_range()) { 33 let range = match range.intersect(token.text_range()) {
34 Some(range) => range, 34 Some(range) => range,
35 None => continue, 35 None => continue,
36 } - token.text_range().start(); 36 } - token.text_range().start();
37 let text = token.text(); 37 let text = token.text();
38 for (pos, _) in text[range].bytes().enumerate().filter(|&(_, b)| b == b'\n') { 38 for (pos, _) in text[range].bytes().enumerate().filter(|&(_, b)| b == b'\n') {
39 let pos: TextUnit = (pos as u32).into(); 39 let pos: TextSize = (pos as u32).into();
40 let off = token.text_range().start() + range.start() + pos; 40 let off = token.text_range().start() + range.start() + pos;
41 if !edit.invalidates_offset(off) { 41 if !edit.invalidates_offset(off) {
42 remove_newline(&mut edit, &token, off); 42 remove_newline(&mut edit, &token, off);
@@ -47,16 +47,16 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
47 edit.finish() 47 edit.finish()
48} 48}
49 49
50fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextUnit) { 50fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextSize) {
51 if token.kind() != WHITESPACE || token.text().bytes().filter(|&b| b == b'\n').count() != 1 { 51 if token.kind() != WHITESPACE || token.text().bytes().filter(|&b| b == b'\n').count() != 1 {
52 // The node is either the first or the last in the file 52 // The node is either the first or the last in the file
53 let suff = &token.text()[TextRange::from_to( 53 let suff = &token.text()[TextRange::new(
54 offset - token.text_range().start() + TextUnit::of_char('\n'), 54 offset - token.text_range().start() + TextSize::of('\n'),
55 TextUnit::of_str(token.text()), 55 TextSize::of(token.text().as_str()),
56 )]; 56 )];
57 let spaces = suff.bytes().take_while(|&b| b == b' ').count(); 57 let spaces = suff.bytes().take_while(|&b| b == b' ').count();
58 58
59 edit.replace(TextRange::offset_len(offset, ((spaces + 1) as u32).into()), " ".to_string()); 59 edit.replace(TextRange::at(offset, ((spaces + 1) as u32).into()), " ".to_string());
60 return; 60 return;
61 } 61 }
62 62
@@ -65,7 +65,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextU
65 let next = token.next_sibling_or_token().unwrap(); 65 let next = token.next_sibling_or_token().unwrap();
66 if is_trailing_comma(prev.kind(), next.kind()) { 66 if is_trailing_comma(prev.kind(), next.kind()) {
67 // Removes: trailing comma, newline (incl. surrounding whitespace) 67 // Removes: trailing comma, newline (incl. surrounding whitespace)
68 edit.delete(TextRange::from_to(prev.text_range().start(), token.text_range().end())); 68 edit.delete(TextRange::new(prev.text_range().start(), token.text_range().end()));
69 return; 69 return;
70 } 70 }
71 if prev.kind() == T![,] && next.kind() == T!['}'] { 71 if prev.kind() == T![,] && next.kind() == T!['}'] {
@@ -76,7 +76,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextU
76 " " 76 " "
77 }; 77 };
78 edit.replace( 78 edit.replace(
79 TextRange::from_to(prev.text_range().start(), token.text_range().end()), 79 TextRange::new(prev.text_range().start(), token.text_range().end()),
80 space.to_string(), 80 space.to_string(),
81 ); 81 );
82 return; 82 return;
@@ -87,9 +87,9 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextU
87 next.as_token().cloned().and_then(ast::Comment::cast), 87 next.as_token().cloned().and_then(ast::Comment::cast),
88 ) { 88 ) {
89 // Removes: newline (incl. surrounding whitespace), start of the next comment 89 // Removes: newline (incl. surrounding whitespace), start of the next comment
90 edit.delete(TextRange::from_to( 90 edit.delete(TextRange::new(
91 token.text_range().start(), 91 token.text_range().start(),
92 next.syntax().text_range().start() + TextUnit::of_str(next.prefix()), 92 next.syntax().text_range().start() + TextSize::of(next.prefix()),
93 )); 93 ));
94 return; 94 return;
95 } 95 }
@@ -170,7 +170,7 @@ mod tests {
170 170
171 fn check_join_lines(before: &str, after: &str) { 171 fn check_join_lines(before: &str, after: &str) {
172 check_action(before, after, |file, offset| { 172 check_action(before, after, |file, offset| {
173 let range = TextRange::offset_len(offset, 0.into()); 173 let range = TextRange::empty(offset);
174 let res = join_lines(file, range); 174 let res = join_lines(file, range);
175 Some(res) 175 Some(res)
176 }) 176 })
@@ -420,10 +420,10 @@ fn foo() {
420 check_join_lines( 420 check_join_lines(
421 r" 421 r"
422<|>use ra_syntax::{ 422<|>use ra_syntax::{
423 TextUnit, TextRange, 423 TextSize, TextRange,
424};", 424};",
425 r" 425 r"
426<|>use ra_syntax::{TextUnit, TextRange, 426<|>use ra_syntax::{TextSize, TextRange,
427};", 427};",
428 ); 428 );
429 } 429 }
@@ -434,11 +434,11 @@ fn foo() {
434 check_join_lines( 434 check_join_lines(
435 r" 435 r"
436use ra_syntax::{ 436use ra_syntax::{
437<|> TextUnit, TextRange 437<|> TextSize, TextRange
438};", 438};",
439 r" 439 r"
440use ra_syntax::{ 440use ra_syntax::{
441<|> TextUnit, TextRange};", 441<|> TextSize, TextRange};",
442 ); 442 );
443 } 443 }
444 444
@@ -448,11 +448,11 @@ use ra_syntax::{
448 check_join_lines( 448 check_join_lines(
449 r" 449 r"
450use ra_syntax::{ 450use ra_syntax::{
451<|> TextUnit, TextRange, 451<|> TextSize, TextRange,
452};", 452};",
453 r" 453 r"
454use ra_syntax::{ 454use ra_syntax::{
455<|> TextUnit, TextRange};", 455<|> TextSize, TextRange};",
456 ); 456 );
457 } 457 }
458 458
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index f692fbaa2..09f602fe1 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -60,7 +60,7 @@ use ra_ide_db::{
60 symbol_index::{self, FileSymbol}, 60 symbol_index::{self, FileSymbol},
61 LineIndexDatabase, 61 LineIndexDatabase,
62}; 62};
63use ra_syntax::{SourceFile, TextRange, TextUnit}; 63use ra_syntax::{SourceFile, TextRange, TextSize};
64 64
65use crate::display::ToNav; 65use crate::display::ToNav;
66 66
@@ -265,7 +265,7 @@ impl Analysis {
265 265
266 /// Returns position of the matching brace (all types of braces are 266 /// Returns position of the matching brace (all types of braces are
267 /// supported). 267 /// supported).
268 pub fn matching_brace(&self, position: FilePosition) -> Cancelable<Option<TextUnit>> { 268 pub fn matching_brace(&self, position: FilePosition) -> Cancelable<Option<TextSize>> {
269 self.with_db(|db| { 269 self.with_db(|db| {
270 let parse = db.parse(position.file_id); 270 let parse = db.parse(position.file_id);
271 let file = parse.tree(); 271 let file = parse.tree();
diff --git a/crates/ra_ide/src/matching_brace.rs b/crates/ra_ide/src/matching_brace.rs
index d1204fac0..b85348706 100644
--- a/crates/ra_ide/src/matching_brace.rs
+++ b/crates/ra_ide/src/matching_brace.rs
@@ -1,8 +1,8 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use ra_syntax::{ast::AstNode, SourceFile, SyntaxKind, TextUnit, T}; 3use ra_syntax::{ast::AstNode, SourceFile, SyntaxKind, TextSize, T};
4 4
5pub fn matching_brace(file: &SourceFile, offset: TextUnit) -> Option<TextUnit> { 5pub fn matching_brace(file: &SourceFile, offset: TextSize) -> Option<TextSize> {
6 const BRACES: &[SyntaxKind] = 6 const BRACES: &[SyntaxKind] =
7 &[T!['{'], T!['}'], T!['['], T![']'], T!['('], T![')'], T![<], T![>]]; 7 &[T!['{'], T!['}'], T!['['], T![']'], T!['('], T![')'], T![<], T![>]];
8 let (brace_node, brace_idx) = file 8 let (brace_node, brace_idx) = file
diff --git a/crates/ra_ide/src/parent_module.rs b/crates/ra_ide/src/parent_module.rs
index 958b92bed..aaf4460df 100644
--- a/crates/ra_ide/src/parent_module.rs
+++ b/crates/ra_ide/src/parent_module.rs
@@ -76,7 +76,7 @@ mod tests {
76 ", 76 ",
77 ); 77 );
78 let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); 78 let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
79 nav.assert_match("foo MODULE FileId(1) [0; 8)"); 79 nav.assert_match("foo MODULE FileId(1) 0..8");
80 } 80 }
81 81
82 #[test] 82 #[test]
@@ -95,7 +95,7 @@ mod tests {
95 ", 95 ",
96 ); 96 );
97 let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); 97 let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
98 nav.assert_match("foo MODULE FileId(1) [0; 8)"); 98 nav.assert_match("foo MODULE FileId(1) 0..8");
99 } 99 }
100 100
101 #[test] 101 #[test]
@@ -111,7 +111,7 @@ mod tests {
111 ", 111 ",
112 ); 112 );
113 let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); 113 let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
114 nav.assert_match("baz MODULE FileId(1) [32; 44)"); 114 nav.assert_match("baz MODULE FileId(1) 32..44");
115 } 115 }
116 116
117 #[test] 117 #[test]
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 7d0544ff4..555ccf295 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -144,7 +144,7 @@ fn find_name(
144 144
145fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Option<ReferenceAccess> { 145fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Option<ReferenceAccess> {
146 match def { 146 match def {
147 Definition::Local(_) | Definition::StructField(_) => {} 147 Definition::Local(_) | Definition::Field(_) => {}
148 _ => return None, 148 _ => return None,
149 }; 149 };
150 150
@@ -214,8 +214,8 @@ mod tests {
214 let refs = get_all_refs(code); 214 let refs = get_all_refs(code);
215 check_result( 215 check_result(
216 refs, 216 refs,
217 "Foo STRUCT_DEF FileId(1) [5; 39) [12; 15) Other", 217 "Foo STRUCT_DEF FileId(1) 5..39 12..15 Other",
218 &["FileId(1) [138; 141) StructLiteral"], 218 &["FileId(1) 138..141 StructLiteral"],
219 ); 219 );
220 } 220 }
221 221
@@ -231,8 +231,8 @@ mod tests {
231 let refs = get_all_refs(code); 231 let refs = get_all_refs(code);
232 check_result( 232 check_result(
233 refs, 233 refs,
234 "Foo STRUCT_DEF FileId(1) [5; 18) [12; 15) Other", 234 "Foo STRUCT_DEF FileId(1) 5..18 12..15 Other",
235 &["FileId(1) [54; 57) Other", "FileId(1) [71; 74) StructLiteral"], 235 &["FileId(1) 54..57 Other", "FileId(1) 71..74 StructLiteral"],
236 ); 236 );
237 } 237 }
238 238
@@ -248,8 +248,8 @@ mod tests {
248 let refs = get_all_refs(code); 248 let refs = get_all_refs(code);
249 check_result( 249 check_result(
250 refs, 250 refs,
251 "Foo STRUCT_DEF FileId(1) [5; 21) [12; 15) Other", 251 "Foo STRUCT_DEF FileId(1) 5..21 12..15 Other",
252 &["FileId(1) [81; 84) StructLiteral"], 252 &["FileId(1) 81..84 StructLiteral"],
253 ); 253 );
254 } 254 }
255 255
@@ -266,8 +266,8 @@ mod tests {
266 let refs = get_all_refs(code); 266 let refs = get_all_refs(code);
267 check_result( 267 check_result(
268 refs, 268 refs,
269 "Foo STRUCT_DEF FileId(1) [5; 21) [12; 15) Other", 269 "Foo STRUCT_DEF FileId(1) 5..21 12..15 Other",
270 &["FileId(1) [71; 74) StructLiteral"], 270 &["FileId(1) 71..74 StructLiteral"],
271 ); 271 );
272 } 272 }
273 273
@@ -289,12 +289,12 @@ mod tests {
289 let refs = get_all_refs(code); 289 let refs = get_all_refs(code);
290 check_result( 290 check_result(
291 refs, 291 refs,
292 "i BIND_PAT FileId(1) [33; 34) Other Write", 292 "i BIND_PAT FileId(1) 33..34 Other Write",
293 &[ 293 &[
294 "FileId(1) [67; 68) Other Write", 294 "FileId(1) 67..68 Other Write",
295 "FileId(1) [71; 72) Other Read", 295 "FileId(1) 71..72 Other Read",
296 "FileId(1) [101; 102) Other Write", 296 "FileId(1) 101..102 Other Write",
297 "FileId(1) [127; 128) Other Write", 297 "FileId(1) 127..128 Other Write",
298 ], 298 ],
299 ); 299 );
300 } 300 }
@@ -315,8 +315,8 @@ mod tests {
315 let refs = get_all_refs(code); 315 let refs = get_all_refs(code);
316 check_result( 316 check_result(
317 refs, 317 refs,
318 "spam BIND_PAT FileId(1) [44; 48) Other", 318 "spam BIND_PAT FileId(1) 44..48 Other",
319 &["FileId(1) [71; 75) Other Read", "FileId(1) [78; 82) Other Read"], 319 &["FileId(1) 71..75 Other Read", "FileId(1) 78..82 Other Read"],
320 ); 320 );
321 } 321 }
322 322
@@ -328,11 +328,7 @@ mod tests {
328 }"#; 328 }"#;
329 329
330 let refs = get_all_refs(code); 330 let refs = get_all_refs(code);
331 check_result( 331 check_result(refs, "i BIND_PAT FileId(1) 12..13 Other", &["FileId(1) 38..39 Other Read"]);
332 refs,
333 "i BIND_PAT FileId(1) [12; 13) Other",
334 &["FileId(1) [38; 39) Other Read"],
335 );
336 } 332 }
337 333
338 #[test] 334 #[test]
@@ -343,11 +339,7 @@ mod tests {
343 }"#; 339 }"#;
344 340
345 let refs = get_all_refs(code); 341 let refs = get_all_refs(code);
346 check_result( 342 check_result(refs, "i BIND_PAT FileId(1) 12..13 Other", &["FileId(1) 38..39 Other Read"]);
347 refs,
348 "i BIND_PAT FileId(1) [12; 13) Other",
349 &["FileId(1) [38; 39) Other Read"],
350 );
351 } 343 }
352 344
353 #[test] 345 #[test]
@@ -366,8 +358,8 @@ mod tests {
366 let refs = get_all_refs(code); 358 let refs = get_all_refs(code);
367 check_result( 359 check_result(
368 refs, 360 refs,
369 "spam RECORD_FIELD_DEF FileId(1) [66; 79) [70; 74) Other", 361 "spam RECORD_FIELD_DEF FileId(1) 66..79 70..74 Other",
370 &["FileId(1) [152; 156) Other Read"], 362 &["FileId(1) 152..156 Other Read"],
371 ); 363 );
372 } 364 }
373 365
@@ -382,7 +374,7 @@ mod tests {
382 "#; 374 "#;
383 375
384 let refs = get_all_refs(code); 376 let refs = get_all_refs(code);
385 check_result(refs, "f FN_DEF FileId(1) [88; 104) [91; 92) Other", &[]); 377 check_result(refs, "f FN_DEF FileId(1) 88..104 91..92 Other", &[]);
386 } 378 }
387 379
388 #[test] 380 #[test]
@@ -397,7 +389,7 @@ mod tests {
397 "#; 389 "#;
398 390
399 let refs = get_all_refs(code); 391 let refs = get_all_refs(code);
400 check_result(refs, "B ENUM_VARIANT FileId(1) [83; 84) [83; 84) Other", &[]); 392 check_result(refs, "B ENUM_VARIANT FileId(1) 83..84 83..84 Other", &[]);
401 } 393 }
402 394
403 #[test] 395 #[test]
@@ -438,8 +430,8 @@ mod tests {
438 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); 430 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
439 check_result( 431 check_result(
440 refs, 432 refs,
441 "Foo STRUCT_DEF FileId(2) [16; 50) [27; 30) Other", 433 "Foo STRUCT_DEF FileId(2) 16..50 27..30 Other",
442 &["FileId(1) [52; 55) StructLiteral", "FileId(3) [77; 80) StructLiteral"], 434 &["FileId(1) 52..55 StructLiteral", "FileId(3) 77..80 StructLiteral"],
443 ); 435 );
444 } 436 }
445 437
@@ -466,11 +458,7 @@ mod tests {
466 458
467 let (analysis, pos) = analysis_and_position(code); 459 let (analysis, pos) = analysis_and_position(code);
468 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); 460 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
469 check_result( 461 check_result(refs, "foo SOURCE_FILE FileId(2) 0..35 Other", &["FileId(1) 13..16 Other"]);
470 refs,
471 "foo SOURCE_FILE FileId(2) [0; 35) Other",
472 &["FileId(1) [13; 16) Other"],
473 );
474 } 462 }
475 463
476 #[test] 464 #[test]
@@ -497,8 +485,8 @@ mod tests {
497 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); 485 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
498 check_result( 486 check_result(
499 refs, 487 refs,
500 "Foo STRUCT_DEF FileId(3) [0; 41) [18; 21) Other", 488 "Foo STRUCT_DEF FileId(3) 0..41 18..21 Other",
501 &["FileId(2) [20; 23) Other", "FileId(2) [46; 49) StructLiteral"], 489 &["FileId(2) 20..23 Other", "FileId(2) 46..49 StructLiteral"],
502 ); 490 );
503 } 491 }
504 492
@@ -525,16 +513,16 @@ mod tests {
525 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); 513 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
526 check_result( 514 check_result(
527 refs, 515 refs,
528 "quux FN_DEF FileId(1) [18; 34) [25; 29) Other", 516 "quux FN_DEF FileId(1) 18..34 25..29 Other",
529 &["FileId(2) [16; 20) StructLiteral", "FileId(3) [16; 20) StructLiteral"], 517 &["FileId(2) 16..20 StructLiteral", "FileId(3) 16..20 StructLiteral"],
530 ); 518 );
531 519
532 let refs = 520 let refs =
533 analysis.find_all_refs(pos, Some(SearchScope::single_file(bar))).unwrap().unwrap(); 521 analysis.find_all_refs(pos, Some(SearchScope::single_file(bar))).unwrap().unwrap();
534 check_result( 522 check_result(
535 refs, 523 refs,
536 "quux FN_DEF FileId(1) [18; 34) [25; 29) Other", 524 "quux FN_DEF FileId(1) 18..34 25..29 Other",
537 &["FileId(3) [16; 20) StructLiteral"], 525 &["FileId(3) 16..20 StructLiteral"],
538 ); 526 );
539 } 527 }
540 528
@@ -552,8 +540,8 @@ mod tests {
552 let refs = get_all_refs(code); 540 let refs = get_all_refs(code);
553 check_result( 541 check_result(
554 refs, 542 refs,
555 "m1 MACRO_CALL FileId(1) [9; 63) [46; 48) Other", 543 "m1 MACRO_CALL FileId(1) 9..63 46..48 Other",
556 &["FileId(1) [96; 98) StructLiteral", "FileId(1) [114; 116) StructLiteral"], 544 &["FileId(1) 96..98 StructLiteral", "FileId(1) 114..116 StructLiteral"],
557 ); 545 );
558 } 546 }
559 547
@@ -568,8 +556,8 @@ mod tests {
568 let refs = get_all_refs(code); 556 let refs = get_all_refs(code);
569 check_result( 557 check_result(
570 refs, 558 refs,
571 "i BIND_PAT FileId(1) [40; 41) Other Write", 559 "i BIND_PAT FileId(1) 40..41 Other Write",
572 &["FileId(1) [59; 60) Other Write", "FileId(1) [63; 64) Other Read"], 560 &["FileId(1) 59..60 Other Write", "FileId(1) 63..64 Other Read"],
573 ); 561 );
574 } 562 }
575 563
@@ -588,8 +576,8 @@ mod tests {
588 let refs = get_all_refs(code); 576 let refs = get_all_refs(code);
589 check_result( 577 check_result(
590 refs, 578 refs,
591 "f RECORD_FIELD_DEF FileId(1) [32; 38) [32; 33) Other", 579 "f RECORD_FIELD_DEF FileId(1) 32..38 32..33 Other",
592 &["FileId(1) [96; 97) Other Read", "FileId(1) [117; 118) Other Write"], 580 &["FileId(1) 96..97 Other Read", "FileId(1) 117..118 Other Write"],
593 ); 581 );
594 } 582 }
595 583
@@ -602,11 +590,7 @@ mod tests {
602 }"#; 590 }"#;
603 591
604 let refs = get_all_refs(code); 592 let refs = get_all_refs(code);
605 check_result( 593 check_result(refs, "i BIND_PAT FileId(1) 36..37 Other", &["FileId(1) 51..52 Other Write"]);
606 refs,
607 "i BIND_PAT FileId(1) [36; 37) Other",
608 &["FileId(1) [51; 52) Other Write"],
609 );
610 } 594 }
611 595
612 fn get_all_refs(text: &str) -> ReferenceSearchResult { 596 fn get_all_refs(text: &str) -> ReferenceSearchResult {
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 9acc6158a..fd17bc9f2 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -51,18 +51,15 @@ fn source_edit_from_reference(reference: Reference, new_name: &str) -> SourceFil
51 let mut replacement_text = String::new(); 51 let mut replacement_text = String::new();
52 let file_id = reference.file_range.file_id; 52 let file_id = reference.file_range.file_id;
53 let range = match reference.kind { 53 let range = match reference.kind {
54 ReferenceKind::StructFieldShorthandForField => { 54 ReferenceKind::FieldShorthandForField => {
55 replacement_text.push_