language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename ra_hir_def -> hir_def

Browse source
This commit is contained in:
Aleksey Kladov 2020-08-13 16:28:27 +02:00
parent b7aa4898e0
commit b28c54a2c2
51 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/rust-analyzer/Cargo.toml
View file

@ -50,7 +50,7 @@ base_db = { path = "../base_db" }
ra_ide_db = { path = "../ra_ide_db" }
ra_ssr = { path = "../ra_ssr" }
hir = { path = "../ra_hir", package = "ra_hir" }
hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
hir_def = { path = "../hir_def" }
hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
proc_macro_srv = { path = "../proc_macro_srv" }

12
crates/rust-analyzer/src/diagnostics/to_proto.rs
View file

@ -1116,7 +1116,7 @@ mod tests {
fn macro_compiler_error() {
check(
r##"{
"rendered": "error: Please register your known path in the path module\n --> crates/ra_hir_def/src/path.rs:265:9\n |\n265 | compile_error!(\"Please register your known path in the path module\")\n | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n | \n ::: crates/ra_hir_def/src/data.rs:80:16\n |\n80 | let path = path![std::future::Future];\n | -------------------------- in this macro invocation\n\n",
"rendered": "error: Please register your known path in the path module\n --> crates/hir_def/src/path.rs:265:9\n |\n265 | compile_error!(\"Please register your known path in the path module\")\n | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n | \n ::: crates/hir_def/src/data.rs:80:16\n |\n80 | let path = path![std::future::Future];\n | -------------------------- in this macro invocation\n\n",
"children": [],
"code": null,
"level": "error",
@ -1134,7 +1134,7 @@ mod tests {
"column_end": 2,
"column_start": 1,
"expansion": null,
"file_name": "crates/ra_hir_def/src/path.rs",
"file_name": "crates/hir_def/src/path.rs",
"is_primary": false,
"label": null,
"line_end": 267,
@ -1227,7 +1227,7 @@ mod tests {
"column_end": 2,
"column_start": 1,
"expansion": null,
"file_name": "crates/ra_hir_def/src/path.rs",
"file_name": "crates/hir_def/src/path.rs",
"is_primary": false,
"label": null,
"line_end": 277,
@ -1284,7 +1284,7 @@ mod tests {
"column_end": 42,
"column_start": 16,
"expansion": null,
"file_name": "crates/ra_hir_def/src/data.rs",
"file_name": "crates/hir_def/src/data.rs",
"is_primary": false,
"label": null,
"line_end": 80,
@ -1300,7 +1300,7 @@ mod tests {
]
}
},
"file_name": "crates/ra_hir_def/src/path.rs",
"file_name": "crates/hir_def/src/path.rs",
"is_primary": false,
"label": null,
"line_end": 272,
@ -1316,7 +1316,7 @@ mod tests {
]
}
},
"file_name": "crates/ra_hir_def/src/path.rs",
"file_name": "crates/hir_def/src/path.rs",
"is_primary": true,
"label": null,
"line_end": 265,

4
crates/rust-analyzer/test_data/macro_compiler_error.txt
View file

@ -1,6 +1,6 @@
[
MappedRustDiagnostic {
url: "file:///test/crates/ra_hir_def/src/data.rs",
url: "file:///test/crates/hir_def/src/data.rs",
diagnostic: Diagnostic {
range: Range {
start: Position {
@ -24,7 +24,7 @@
[
DiagnosticRelatedInformation {
location: Location {
uri: "file:///test/crates/ra_hir_def/src/path.rs",
uri: "file:///test/crates/hir_def/src/path.rs",
range: Range {
start: Position {
line: 264,