Skip to content

[WIP]: generating rust-project file for r-a #120611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
onur-ozkan wants to merge 7 commits into from
Closed

[WIP]: generating rust-project file for r-a #120611

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6533515
create helper function `project_metadata` in bootstrap
onur-ozkan Feb 3, 2024
8e6a409
implement new util `ra_project` for bootstrap
onur-ozkan Feb 3, 2024
e125924
add setup step for generating `rust-project.json`
onur-ozkan Feb 3, 2024
c78ef01
ignore `rust-project.json`
onur-ozkan Feb 3, 2024
8bbdb07
no need for `Serialize` on ra_project types
onur-ozkan Feb 3, 2024
9219a80
compile proc-macro crates and fill dylibs for ra
onur-ozkan Feb 5, 2024
558bb77
set `CARGO_TARGET_DIR` on proc-macro builds
onur-ozkan Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
no need for Serialize on ra_project types 
Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
@onur-ozkan
onur-ozkan committed Feb 3, 2024
commit 8bbdb075131020f80cc979449bcdacbb6d8f0ce9
8 changes: 4 additions & 4 deletions src/bootstrap/src/utils/ra_project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
//!
//! [zulip thread]: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/r-a.20support.20for.20rust-lang.2Frust.20via.20project-rust.2Ejson/near/412505824

use serde_derive::{Deserialize, Serialize};
use serde_derive::Serialize;
use std::collections::{BTreeMap, BTreeSet};
use std::io;
use std::path::Path;

use crate::core::metadata::{project_metadata, workspace_members, Dependency};
use crate::Config;

#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, Serialize)]
/// FIXME(before-merge): doc-comment
pub(crate) struct RustAnalyzerProject {
crates: Vec<Crate>,
sysroot: String,
sysroot_src: String,
}

#[derive(Debug, Default, Deserialize, Serialize, PartialEq)]
#[derive(Debug, Default, Serialize, PartialEq)]
struct Crate {
cfg: Vec<String>,
deps: BTreeSet<Dep>,
Expand All @@ -39,7 +39,7 @@ struct Crate {
root_module: String,
}

#[derive(Debug, Default, Deserialize, Serialize, PartialEq, PartialOrd, Ord, Eq)]
#[derive(Debug, Default, Serialize, PartialEq, PartialOrd, Ord, Eq)]
struct Dep {
#[serde(rename = "crate")]
crate_index: usize,
Expand Down