Merge pull request #3 from cormacrelf/config-tree

Config tree

Author: alibektas

Cargo.lock

@@ -100,6 +100,7 @@ nohash-hasher = "0.2.0"
 text-size = "1.1.0"
 serde = { version = "1.0.156", features = ["derive"] }
 serde_json = "1.0.96"
+salsa  = "0.17.0-pre.2"
 triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
 # can't upgrade due to dashmap depending on 0.12.3 currently
 hashbrown = { version = "0.12.3", features = [

Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true
 doctest = false
 
 [dependencies]
-salsa = "0.17.0-pre.2"
+salsa.workspace = true
 rustc-hash = "1.1.0"
 
 triomphe.workspace = true

crates/base-db/Cargo.toml

@@ -136,7 +136,8 @@ impl AbsPath {
     /// # Panics
     ///
     /// Panics if `path` is not absolute.
-    pub fn assert(path: &Path) -> &AbsPath {
+    pub fn assert<P: AsRef<Path> + ?Sized>(path: &P) -> &AbsPath {
+        let path = path.as_ref();
         assert!(path.is_absolute());
         unsafe { &*(path as *const Path as *const AbsPath) }
     }
@@ -194,6 +195,10 @@ impl AbsPath {
         self.0.ends_with(&suffix.0)
     }
 
+    pub fn ancestors(&self) -> impl Iterator<Item = &AbsPath> {
+        self.0.ancestors().map(AbsPath::assert)
+    }
+
     pub fn name_and_extension(&self) -> Option<(&str, Option<&str>)> {
         Some((
             self.file_stem()?.to_str()?,

crates/paths/src/lib.rs

@@ -75,6 +75,7 @@ toolchain.workspace = true
 vfs-notify.workspace = true
 vfs.workspace = true
 la-arena.workspace = true
+salsa.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.9"

crates/rust-analyzer/Cargo.toml

@@ -42,6 +42,7 @@ use crate::{
 };
 
 mod patch_old_style;
+mod tree;
 
 // Conventions for configuration keys to preserve maximal extendability without breakage:
 //  - Toggles (be it binary true/false or with more options in-between) should almost always suffix as `_enable`
@@ -2194,7 +2195,7 @@ enum AdjustmentHintsDef {
     Reborrow,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(untagged)]
 enum DiscriminantHintsDef {
     #[serde(with = "true_or_always")]