Make ConfigData Ser and TOML De

This commit makes rust-analyzer::config module TOML ser and de.
Co-Authored-By: Cormac Relf <web@cormacrelf.net>

Author: 2 people

Cargo.lock

@@ -19,16 +19,17 @@ use vfs::{file_set::FileSet, AbsPathBuf, AnchoredPath, FileId, VfsPath};
 // Map from crate id to the name of the crate and path of the proc-macro. If the value is `None`,
 // then the crate for the proc-macro hasn't been build yet as the build data is missing.
 pubtypeProcMacroPaths = FxHashMap<CrateId,Result<(Option<String>,AbsPathBuf),String>>;
+
+#[derive(Debug,Clone,Copy,PartialEq,Eq,Hash,PartialOrd,Ord)]
+pubstructSourceRootId(pubu32);
+
 /// Files are grouped into source roots. A source root is a directory on the
 /// file systems which is watched for changes. Typically it corresponds to a
 /// Rust crate. Source roots *might* be nested: in this case, a file belongs to
 /// the nearest enclosing source root. Paths to files are always relative to a
 /// source root, and the analyzer does not know the root path of the source root at
 /// all. So, a file from one source root can't refer to a file in another source
 /// root by path.
-#[derive(Debug,Clone,Copy,PartialEq,Eq,Hash,PartialOrd,Ord)]
-pubstructSourceRootId(pubu32);
-
 #[derive(Clone,Debug,PartialEq,Eq)]
 pubstructSourceRoot{
 /// Sysroot or crates.io library.

crates/base-db/src/input.rs

@@ -64,7 +64,7 @@ use hir::ChangeWithProcMacros;
 use ide_db::{
  base_db::{
  salsa::{self,ParallelDatabase},
-CrateOrigin,Env,FileLoader,FileSet,SourceDatabase,VfsPath,
+CrateOrigin,Env,FileLoader,FileSet,SourceDatabase,SourceDatabaseExt,VfsPath,
 },
  prime_caches, symbol_index,FxHashMap,FxIndexSet,LineIndexDatabase,
 };
@@ -271,6 +271,10 @@ impl Analysis {
 self.with_db(|db| status::status(db, file_id))
 }
 
+pubfnsource_root(&self,file_id:FileId) -> Cancellable<SourceRootId>{
+self.with_db(|db| db.file_source_root(file_id))
+}
+
 pubfnparallel_prime_caches<F>(&self,num_worker_threads:u8,cb:F) -> Cancellable<()>
 where
 F:Fn(ParallelPrimeCachesProgress) + Sync + std::panic::UnwindSafe,
@@ -280,7 +284,7 @@ impl Analysis {
 
 /// Gets the text of the source file.
 pubfnfile_text(&self,file_id:FileId) -> Cancellable<Arc<str>>{
-self.with_db(|db| db.file_text(file_id))
+self.with_db(|db| SourceDatabaseExt::file_text(db,file_id))
 }
 
 /// Gets the syntax tree of the file.
@@ -290,7 +294,6 @@ impl Analysis {
 
 /// Returns true if this file belongs to an immutable library.
 pubfnis_library_file(&self,file_id:FileId) -> Cancellable<bool>{
-use ide_db::base_db::SourceDatabaseExt;
 self.with_db(|db| db.source_root(db.file_source_root(file_id)).is_library)
 }
 

crates/ide/src/lib.rs

@@ -4,8 +4,9 @@
 use std::{fmt, str::FromStr};
 
 use cfg::CfgOptions;
+use serde::Serialize;
 
-#[derive(Clone,Eq,PartialEq,Debug)]
+#[derive(Clone,Eq,PartialEq,Debug,Serialize)]
 pubenumCfgFlag{
 Atom(String),
 KeyValue{key:String,value:String},

crates/project-model/src/cfg_flag.rs

@@ -52,7 +52,7 @@
 use base_db::{CrateDisplayName,CrateName};
 use paths::{AbsPath,AbsPathBuf,Utf8PathBuf};
 use rustc_hash::FxHashMap;
-use serde::{de,Deserialize};
+use serde::{de,Deserialize,Serialize};
 use span::Edition;
 
 usecrate::cfg_flag::CfgFlag;
@@ -161,14 +161,14 @@ impl ProjectJson {
 }
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 pubstructProjectJsonData{
 sysroot:Option<Utf8PathBuf>,
 sysroot_src:Option<Utf8PathBuf>,
 crates:Vec<CrateData>,
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 structCrateData{
 display_name:Option<String>,
 root_module:Utf8PathBuf,
@@ -190,7 +190,7 @@ struct CrateData {
 repository:Option<String>,
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 #[serde(rename = "edition")]
 enumEditionData{
 #[serde(rename = "2015")]
@@ -218,20 +218,21 @@ impl From<EditionData> for Edition {
 ///
 /// This will differ from `CrateId` when multiple `ProjectJson`
 /// workspaces are loaded.
-#[derive(Deserialize,Debug,Clone,Copy,Eq,PartialEq,Hash)]
+#[derive(Serialize,Deserialize,Debug,Clone,Copy,Eq,PartialEq,Hash)]
 #[serde(transparent)]
 pubstructCrateArrayIdx(pubusize);
 
-#[derive(Deserialize,Debug,Clone,Eq,PartialEq)]
+#[derive(Serialize,Deserialize,Debug,Clone,Eq,PartialEq)]
 pub(crate)structDep{
 /// Identifies a crate by position in the crates array.
 #[serde(rename = "crate")]
 pub(crate)krate:CrateArrayIdx,
+#[serde(serialize_with = "serialize_crate_name")]
 #[serde(deserialize_with = "deserialize_crate_name")]
 pub(crate)name:CrateName,
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 structCrateSource{
 include_dirs:Vec<Utf8PathBuf>,
 exclude_dirs:Vec<Utf8PathBuf>,
@@ -244,3 +245,10 @@ where
 let name = String::deserialize(de)?;
 CrateName::new(&name).map_err(|err| de::Error::custom(format!("invalid crate name: {err:?}")))
 }
+
+fnserialize_crate_name<S>(name:&CrateName,se:S) -> Result<S::Ok,S::Error>
+where
+S: serde::Serializer,
+{
+ se.serialize_str(name)
+}

crates/project-model/src/project_json.rs

@@ -39,11 +39,13 @@ tracing.workspace = true
 tracing-subscriber.workspace = true
 tracing-tree.workspace = true
 triomphe.workspace = true
+toml = "0.8.8"
 nohash-hasher.workspace = true
 always-assert = "0.2.0"
 walkdir = "2.3.2"
 semver.workspace = true
 memchr = "2.7.1"
+indexmap = { version = "2.0.0", features = ["serde"] }
 
 cfg.workspace = true
 flycheck.workspace = true