language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-01 12:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v2

Browse source
This commit is contained in:
Ali Bektas 2023-10-15 17:32:12 +02:00
parent 886eaa0a7d
commit 7e4aad5ba5
6 changed files with 282 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/project-model/src/tests.rs
View file

@ -249,3 +249,53 @@ fn crate_graph_dedup() {
crate_graph.extend(regex_crate_graph, &mut regex_proc_macros);
assert_eq!(crate_graph.iter().count(), 118);
}
#[test]
fn test_deduplicate_crate_differing_in_origin() {
let path_map = &mut Default::default();
let (mut crate_graph, _proc_macros) =
load_cargo_with_sysroot(path_map, "deduplication_crate_graph_A.json");
crate_graph.sort_deps();
let (crate_graph_1, mut _proc_macros_2) =
load_cargo_with_sysroot(path_map, "deduplication_crate_graph_B.json");
crate_graph.extend(crate_graph_1, &mut _proc_macros_2);
let mut crates_named_p1 = vec![];
for id in crate_graph.iter() {
let krate = &crate_graph[id];
if let Some(name) = krate.display_name.as_ref() {
if name.to_string() == "p1" {
crates_named_p1.push(krate);
}
}
}
assert!(crates_named_p1.len() == 1);
assert!(crates_named_p1[0].origin.is_local());
}
#[test]
fn test_deduplicate_crate_differing_in_origin_in_rev_resolution_order() {
let path_map = &mut Default::default();
let (mut crate_graph, _proc_macros) =
load_cargo_with_sysroot(path_map, "deduplication_crate_graph_B.json");
crate_graph.sort_deps();
let (crate_graph_1, mut _proc_macros_2) =
load_cargo_with_sysroot(path_map, "deduplication_crate_graph_A.json");
crate_graph.extend(crate_graph_1, &mut _proc_macros_2);
let mut crates_named_p1 = vec![];
for id in crate_graph.iter() {
let krate = &crate_graph[id];
if let Some(name) = krate.display_name.as_ref() {
if name.to_string() == "p1" {
crates_named_p1.push(krate);
}
}
}
assert!(crates_named_p1.len() == 1);
assert!(crates_named_p1[0].origin.is_local());
}

66
crates/project-model/test_data/deduplication_crate_graph_A.json Normal file
View file

@ -0,0 +1,66 @@
{
"packages": [
{
"name": "p1",
"version": "0.1.0",
"id": "p1 0.1.0 (path+file:///path/to/project/projects/p1)",
"license": null,
"license_file": null,
"description": null,
"source": null,
"dependencies": [],
"targets": [
{
"kind": [
"lib"
],
"crate_types": [
"lib"
],
"name": "p1",
"src_path": "/path/to/project/projects/p1/src/lib.rs",
"edition": "2021",
"doc": true,
"doctest": true,
"test": true
}
],
"features": {},
"manifest_path": "/path/to/project/projects/p1/Cargo.toml",
"metadata": null,
"publish": null,
"authors": [],
"categories": [],
"keywords": [],
"readme": null,
"repository": null,
"homepage": null,
"documentation": null,
"edition": "2021",
"links": null,
"default_run": null,
"rust_version": null
}
],
"workspace_members": [
"p1 0.1.0 (path+file:///path/to/project/projects/p1)"
],
"workspace_default_members": [
"p1 0.1.0 (path+file:///path/to/project/projects/p1)"
],
"resolve": {
"nodes": [
{
"id": "p1 0.1.0 (path+file:///path/to/project/projects/p1)",
"dependencies": [],
"deps": [],
"features": []
}
],
"root": "p1 0.1.0 (path+file:///path/to/project/projects/p1)"
},
"target_directory": "/path/to/project/projects/p1/target",
"version": 1,
"workspace_root": "/path/to/project/projects/p1",
"metadata": null
}

140
crates/project-model/test_data/deduplication_crate_graph_B.json Normal file
View file

@ -0,0 +1,140 @@
{
"packages": [
{
"name": "p1",
"version": "0.1.0",
"id": "p1 0.1.0 (path+file:///path/to/project/projects/p1)",
"license": null,
"license_file": null,
"description": null,
"source": null,
"dependencies": [],
"targets": [
{
"kind": [
"lib"
],
"crate_types": [
"lib"
],
"name": "p1",
"src_path": "/path/to/project/projects/p1/src/lib.rs",
"edition": "2021",
"doc": true,
"doctest": true,
"test": true
}
],
"features": {},
"manifest_path": "/path/to/project/projects/p1/Cargo.toml",
"metadata": null,
"publish": null,
"authors": [],
"categories": [],
"keywords": [],
"readme": null,
"repository": null,
"homepage": null,
"documentation": null,
"edition": "2021",
"links": null,
"default_run": null,
"rust_version": null
},
{
"name": "p2",
"version": "0.1.0",
"id": "p2 0.1.0 (path+file:///path/to/project/projects/p2)",
"license": null,
"license_file": null,
"description": null,
"source": null,
"dependencies": [
{
"name": "p1",
"source": null,
"req": "*",
"kind": null,
"rename": null,
"optional": false,
"uses_default_features": true,
"features": [],
"target": null,
"registry": null,
"path": "/path/to/project/projects/p1"
}
],
"targets": [
{
"kind": [
"lib"
],
"crate_types": [
"lib"
],
"name": "p2",
"src_path": "/path/to/project/projects/p2/src/lib.rs",
"edition": "2021",
"doc": true,
"doctest": true,
"test": true
}
],
"features": {},
"manifest_path": "/path/to/project/projects/p2/Cargo.toml",
"metadata": null,
"publish": null,
"authors": [],
"categories": [],
"keywords": [],
"readme": null,
"repository": null,
"homepage": null,
"documentation": null,
"edition": "2021",
"links": null,
"default_run": null,
"rust_version": null
}
],
"workspace_members": [
"p2 0.1.0 (path+file:///path/to/project/projects/p2)"
],
"workspace_default_members": [
"p2 0.1.0 (path+file:///path/to/project/projects/p2)"
],
"resolve": {
"nodes": [
{
"id": "p1 0.1.0 (path+file:///path/to/project/projects/p1)",
"dependencies": [],
"deps": [],
"features": []
},
{
"id": "p2 0.1.0 (path+file:///path/to/project/projects/p2)",
"dependencies": [
"p1 0.1.0 (path+file:///path/to/project/projects/p1)"
],
"deps": [
{
"name": "p1",
"pkg": "p1 0.1.0 (path+file:///path/to/project/projects/p1)",
"dep_kinds": [
{
"kind": null,
"target": null
}
]
}
],
"features": []
}
],
"root": "p2 0.1.0 (path+file:///path/to/project/projects/p2)"
},
"target_directory": "/path/to/project/projects/p2/target",
"version": 1,
"workspace_root": "/path/to/project/projects/p2",
"metadata": null
}