diff options
10 files changed, 168 insertions, 21 deletions
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt index 58d47d32a..5b2e5187a 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/compiler/mir/tagset.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/compiler/mir/tagset.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -29,7 +36,14 @@ | |||
29 | [ | 36 | [ |
30 | DiagnosticRelatedInformation { | 37 | DiagnosticRelatedInformation { |
31 | location: Location { | 38 | location: Location { |
32 | uri: "file:///test/compiler/lib.rs", | 39 | uri: Url { |
40 | scheme: "file", | ||
41 | host: None, | ||
42 | port: None, | ||
43 | path: "/test/compiler/lib.rs", | ||
44 | query: None, | ||
45 | fragment: None, | ||
46 | }, | ||
33 | range: Range { | 47 | range: Range { |
34 | start: Position { | 48 | start: Position { |
35 | line: 0, | 49 | line: 0, |
@@ -45,7 +59,14 @@ | |||
45 | }, | 59 | }, |
46 | DiagnosticRelatedInformation { | 60 | DiagnosticRelatedInformation { |
47 | location: Location { | 61 | location: Location { |
48 | uri: "file:///test/compiler/mir/tagset.rs", | 62 | uri: Url { |
63 | scheme: "file", | ||
64 | host: None, | ||
65 | port: None, | ||
66 | path: "/test/compiler/mir/tagset.rs", | ||
67 | query: None, | ||
68 | fragment: None, | ||
69 | }, | ||
49 | range: Range { | 70 | range: Range { |
50 | start: Position { | 71 | start: Position { |
51 | line: 41, | 72 | line: 41, |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt index 6aa26bf63..116f0ff73 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/src/main.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/src/main.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt index 7aaffaba2..bbec6a796 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/crates/hir_def/src/data.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/crates/hir_def/src/data.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -25,7 +32,14 @@ | |||
25 | [ | 32 | [ |
26 | DiagnosticRelatedInformation { | 33 | DiagnosticRelatedInformation { |
27 | location: Location { | 34 | location: Location { |
28 | uri: "file:///test/crates/hir_def/src/path.rs", | 35 | uri: Url { |
36 | scheme: "file", | ||
37 | host: None, | ||
38 | port: None, | ||
39 | path: "/test/crates/hir_def/src/path.rs", | ||
40 | query: None, | ||
41 | fragment: None, | ||
42 | }, | ||
29 | range: Range { | 43 | range: Range { |
30 | start: Position { | 44 | start: Position { |
31 | line: 264, | 45 | line: 264, |
@@ -47,7 +61,14 @@ | |||
47 | fixes: [], | 61 | fixes: [], |
48 | }, | 62 | }, |
49 | MappedRustDiagnostic { | 63 | MappedRustDiagnostic { |
50 | url: "file:///test/crates/hir_def/src/path.rs", | 64 | url: Url { |
65 | scheme: "file", | ||
66 | host: None, | ||
67 | port: None, | ||
68 | path: "/test/crates/hir_def/src/path.rs", | ||
69 | query: None, | ||
70 | fragment: None, | ||
71 | }, | ||
51 | diagnostic: Diagnostic { | 72 | diagnostic: Diagnostic { |
52 | range: Range { | 73 | range: Range { |
53 | start: Position { | 74 | start: Position { |
@@ -72,7 +93,14 @@ | |||
72 | [ | 93 | [ |
73 | DiagnosticRelatedInformation { | 94 | DiagnosticRelatedInformation { |
74 | location: Location { | 95 | location: Location { |
75 | uri: "file:///test/crates/hir_def/src/data.rs", | 96 | uri: Url { |
97 | scheme: "file", | ||
98 | host: None, | ||
99 | port: None, | ||
100 | path: "/test/crates/hir_def/src/data.rs", | ||
101 | query: None, | ||
102 | fragment: None, | ||
103 | }, | ||
76 | range: Range { | 104 | range: Range { |
77 | start: Position { | 105 | start: Position { |
78 | line: 79, | 106 | line: 79, |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt index 584213420..2cbf657e5 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/compiler/ty/list_iter.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/compiler/ty/list_iter.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt index 2610e4e20..1142dc2ac 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/runtime/compiler_support.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/runtime/compiler_support.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt index a8d85f008..c709de95f 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/driver/subcommand/repl.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/driver/subcommand/repl.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -46,7 +53,14 @@ | |||
46 | SnippetWorkspaceEdit { | 53 | SnippetWorkspaceEdit { |
47 | changes: Some( | 54 | changes: Some( |
48 | { | 55 | { |
49 | "file:///test/driver/subcommand/repl.rs": [ | 56 | Url { |
57 | scheme: "file", | ||
58 | host: None, | ||
59 | port: None, | ||
60 | path: "/test/driver/subcommand/repl.rs", | ||
61 | query: None, | ||
62 | fragment: None, | ||
63 | }: [ | ||
50 | TextEdit { | 64 | TextEdit { |
51 | range: Range { | 65 | range: Range { |
52 | start: Position { | 66 | start: Position { |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt index 0b8937376..632f438d7 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/driver/subcommand/repl.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/driver/subcommand/repl.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -46,7 +53,14 @@ | |||
46 | SnippetWorkspaceEdit { | 53 | SnippetWorkspaceEdit { |
47 | changes: Some( | 54 | changes: Some( |
48 | { | 55 | { |
49 | "file:///test/driver/subcommand/repl.rs": [ | 56 | Url { |
57 | scheme: "file", | ||
58 | host: None, | ||
59 | port: None, | ||
60 | path: "/test/driver/subcommand/repl.rs", | ||
61 | query: None, | ||
62 | fragment: None, | ||
63 | }: [ | ||
50 | TextEdit { | 64 | TextEdit { |
51 | range: Range { | 65 | range: Range { |
52 | start: Position { | 66 | start: Position { |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt index 7fa9dee62..c0b79428d 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/driver/subcommand/repl.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/driver/subcommand/repl.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -46,7 +53,14 @@ | |||
46 | SnippetWorkspaceEdit { | 53 | SnippetWorkspaceEdit { |
47 | changes: Some( | 54 | changes: Some( |
48 | { | 55 | { |
49 | "file:///test/driver/subcommand/repl.rs": [ | 56 | Url { |
57 | scheme: "file", | ||
58 | host: None, | ||
59 | port: None, | ||
60 | path: "/test/driver/subcommand/repl.rs", | ||
61 | query: None, | ||
62 | fragment: None, | ||
63 | }: [ | ||
50 | TextEdit { | 64 | TextEdit { |
51 | range: Range { | 65 | range: Range { |
52 | start: Position { | 66 | start: Position { |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt index ba1b98b33..782c72dbd 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/compiler/ty/select.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/compiler/ty/select.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -29,7 +36,14 @@ | |||
29 | [ | 36 | [ |
30 | DiagnosticRelatedInformation { | 37 | DiagnosticRelatedInformation { |
31 | location: Location { | 38 | location: Location { |
32 | uri: "file:///test/compiler/ty/select.rs", | 39 | uri: Url { |
40 | scheme: "file", | ||
41 | host: None, | ||
42 | port: None, | ||
43 | path: "/test/compiler/ty/select.rs", | ||
44 | query: None, | ||
45 | fragment: None, | ||
46 | }, | ||
33 | range: Range { | 47 | range: Range { |
34 | start: Position { | 48 | start: Position { |
35 | line: 218, | 49 | line: 218, |
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt index 3c97b2084..d3f27ab6a 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt | |||
@@ -1,6 +1,13 @@ | |||
1 | [ | 1 | [ |
2 | MappedRustDiagnostic { | 2 | MappedRustDiagnostic { |
3 | url: "file:///test/src/main.rs", | 3 | url: Url { |
4 | scheme: "file", | ||
5 | host: None, | ||
6 | port: None, | ||
7 | path: "/test/src/main.rs", | ||
8 | query: None, | ||
9 | fragment: None, | ||
10 | }, | ||
4 | diagnostic: Diagnostic { | 11 | diagnostic: Diagnostic { |
5 | range: Range { | 12 | range: Range { |
6 | start: Position { | 13 | start: Position { |
@@ -29,7 +36,14 @@ | |||
29 | [ | 36 | [ |
30 | DiagnosticRelatedInformation { | 37 | DiagnosticRelatedInformation { |
31 | location: Location { | 38 | location: Location { |
32 | uri: "file:///test/src/main.rs", | 39 | uri: Url { |
40 | scheme: "file", | ||
41 | host: None, | ||
42 | port: None, | ||
43 | path: "/test/src/main.rs", | ||
44 | query: None, | ||
45 | fragment: None, | ||
46 | }, | ||
33 | range: Range { | 47 | range: Range { |
34 | start: Position { | 48 | start: Position { |
35 | line: 2, | 49 | line: 2, |
@@ -61,7 +75,14 @@ | |||
61 | SnippetWorkspaceEdit { | 75 | SnippetWorkspaceEdit { |
62 | changes: Some( | 76 | changes: Some( |
63 | { | 77 | { |
64 | "file:///test/src/main.rs": [ | 78 | Url { |
79 | scheme: "file", | ||
80 | host: None, | ||
81 | port: None, | ||
82 | path: "/test/src/main.rs", | ||
83 | query: None, | ||
84 | fragment: None, | ||
85 | }: [ | ||
65 | TextEdit { | 86 | TextEdit { |
66 | range: Range { | 87 | range: Range { |
67 | start: Position { | 88 | start: Position { |