language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-18 17:40:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

support non-extern-prelude dependencies

Browse source
This commit is contained in:
Jonas Schievink 2021-09-28 21:23:46 +02:00
parent cd9f27d424
commit 0b76b29512
9 changed files with 205 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/project_model/src/project_json.rs
View file

@ -83,9 +83,8 @@ impl ProjectJson {
deps: crate_data
.deps
.into_iter()
.map(|dep_data| Dependency {
crate_id: CrateId(dep_data.krate as u32),
name: dep_data.name,
.map(|dep_data| {
Dependency::new(dep_data.name, CrateId(dep_data.krate as u32))
})
.collect::<Vec<_>>(),
cfg: crate_data.cfg,

38
crates/project_model/src/tests.rs
View file

@ -166,6 +166,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -231,6 +232,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -287,6 +289,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -295,6 +298,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -407,6 +411,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -415,6 +420,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -527,6 +533,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -535,6 +542,7 @@ fn cargo_hello_world_project_model_with_wildcard_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -615,6 +623,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -680,6 +689,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -738,6 +748,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -746,6 +757,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -860,6 +872,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -868,6 +881,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -982,6 +996,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -990,6 +1005,7 @@ fn cargo_hello_world_project_model_with_selective_overrides() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -1061,6 +1077,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -1128,6 +1145,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -1186,6 +1204,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1194,6 +1213,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -1310,6 +1330,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1318,6 +1339,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -1434,6 +1456,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"hello_world",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1442,6 +1465,7 @@ fn cargo_hello_world_project_model() {
name: CrateName(
"libc",
),
prelude: true,
},
],
proc_macro: [],
@ -1491,6 +1515,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"core",
),
prelude: true,
},
],
proc_macro: [],
@ -1581,6 +1606,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"std",
),
prelude: true,
},
],
proc_macro: [],
@ -1644,6 +1670,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"core",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1652,6 +1679,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"alloc",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1660,6 +1688,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"std",
),
prelude: true,
},
],
proc_macro: [],
@ -1804,6 +1833,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"alloc",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1812,6 +1842,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"core",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1820,6 +1851,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"panic_abort",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1828,6 +1860,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"panic_unwind",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1836,6 +1869,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"profiler_builtins",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1844,6 +1878,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"std_detect",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1852,6 +1887,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"term",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1860,6 +1896,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"test",
),
prelude: true,
},
Dependency {
crate_id: CrateId(
@ -1868,6 +1905,7 @@ fn rust_project_hello_world_project_model() {
name: CrateName(
"unwind",
),
prelude: true,
},
],
proc_macro: [],

6
crates/project_model/src/workspace.rs
View file

@ -5,7 +5,9 @@
use std::{collections::VecDeque, convert::TryFrom, fmt, fs, process::Command};
use anyhow::{format_err, Context, Result};
use base_db::{CrateDisplayName, CrateGraph, CrateId, CrateName, Edition, Env, FileId, ProcMacro};
use base_db::{
CrateDisplayName, CrateGraph, CrateId, CrateName, Dependency, Edition, Env, FileId, ProcMacro,
};
use cfg::{CfgDiff, CfgOptions};
use paths::{AbsPath, AbsPathBuf};
use rustc_hash::{FxHashMap, FxHashSet};
@ -875,7 +877,7 @@ fn sysroot_to_crate_graph(
}
fn add_dep(graph: &mut CrateGraph, from: CrateId, name: CrateName, to: CrateId) {
if let Err(err) = graph.add_dep(from, name, to) {
if let Err(err) = graph.add_dep(from, Dependency::new(name, to)) {
tracing::error!("{}", err)
}
}