Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17750 - davidbarsky:david/remove-abspath-requirement-in-linked-projects, r=Veykril

Browse source 
fix: remove AbsPath requirement from linkedProjects

Should (fingers crossed!) fix https://github.com/rust-lang/rust-analyzer/issues/17664. I opened the `rustc` workspace with the [suggested configuration](e552c168c7/src/etc/rust_analyzer_settings.json) and I was able to successfully open some rustc crates (`rustc_incremental`) and have IDE functionality.

`@Veykril:` can you try these changes and let me know if it fixed rustc?
This commit is contained in:
bors 2024-07-31 14:31:16 +00:00
commit f982f3fa2c
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/rust-analyzer/src/config.rs
View file

@ -1677,7 +1677,7 @@ impl Config {
!self.linkedProjects(None).is_empty()
}
pub fn linked_manifests(&self) -> impl Iterator<Item = &AbsPath> + '_ {
pub fn linked_manifests(&self) -> impl Iterator<Item = &Utf8Path> + '_ {
self.linkedProjects(None).iter().filter_map(|it| match it {
ManifestOrProjectJson::Manifest(p) => Some(&**p),
// despite having a buildfile, using this variant as a manifest
@ -2273,11 +2273,7 @@ mod single_or_array {
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[serde(untagged)]
enum ManifestOrProjectJson {
Manifest(
#[serde(serialize_with = "serialize_abs_pathbuf")]
#[serde(deserialize_with = "deserialize_abs_pathbuf")]
AbsPathBuf,
),
Manifest(Utf8PathBuf),
ProjectJson(ProjectJsonData),
DiscoveredProjectJson {
data: ProjectJsonData,
@ -2306,10 +2302,12 @@ where
}
impl ManifestOrProjectJson {
fn manifest(&self) -> Option<&AbsPath> {
fn manifest(&self) -> Option<&Utf8Path> {
match self {
ManifestOrProjectJson::Manifest(manifest) => Some(manifest),
ManifestOrProjectJson::DiscoveredProjectJson { buildfile, .. } => Some(buildfile),
ManifestOrProjectJson::DiscoveredProjectJson { buildfile, .. } => {
Some(buildfile.as_ref())
}
ManifestOrProjectJson::ProjectJson(_) => None,
}
}