Skip to content

Commit 8026658

Browse files
bors[bot]kjeremymatklad
authored
Merge #6531
6531: Update crates r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
2 parents b7bd0bb + f73b874 commit 8026658

12 files changed

+191
-33
lines changed

‎Cargo.lock‎

Lines changed: 22 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {
@@ -29,7 +36,14 @@
2936
[
3037
DiagnosticRelatedInformation {
3138
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+
},
3347
range: Range {
3448
start: Position {
3549
line: 0,
@@ -45,7 +59,14 @@
4559
},
4660
DiagnosticRelatedInformation {
4761
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+
},
4970
range: Range {
5071
start: Position {
5172
line: 41,

‎crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {

‎crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {
@@ -25,7 +32,14 @@
2532
[
2633
DiagnosticRelatedInformation {
2734
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+
},
2943
range: Range {
3044
start: Position {
3145
line: 264,
@@ -47,7 +61,14 @@
4761
fixes: [],
4862
},
4963
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+
},
5172
diagnostic: Diagnostic {
5273
range: Range {
5374
start: Position {
@@ -72,7 +93,14 @@
7293
[
7394
DiagnosticRelatedInformation {
7495
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+
},
76104
range: Range {
77105
start: Position {
78106
line: 79,

‎crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {

‎crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {

‎crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {
@@ -46,7 +53,14 @@
4653
SnippetWorkspaceEdit {
4754
changes: Some(
4855
{
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+
}: [
5064
TextEdit {
5165
range: Range {
5266
start: Position {

‎crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {
@@ -46,7 +53,14 @@
4653
SnippetWorkspaceEdit {
4754
changes: Some(
4855
{
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+
}: [
5064
TextEdit {
5165
range: Range {
5266
start: Position {

‎crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {
@@ -46,7 +53,14 @@
4653
SnippetWorkspaceEdit {
4754
changes: Some(
4855
{
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+
}: [
5064
TextEdit {
5165
range: Range {
5266
start: Position {

‎crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[
22
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+
},
411
diagnostic: Diagnostic {
512
range: Range {
613
start: Position {
@@ -29,7 +36,14 @@
2936
[
3037
DiagnosticRelatedInformation {
3138
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+
},
3347
range: Range {
3448
start: Position {
3549
line: 218,

0 commit comments

Comments
 (0)